Fixed simulation and stuff