This commit also includes various fixes to the parallel controller that came to light while running the experiments.