Some final changes to the simulation and whatnot