added fixed MotionSimulator and reference to RoutePlanner