Fixed 2 Simulation bugs