updated Simulator to handle movement.
lots of fixes in movement.