Fix distance traveled, adjust sim speed
Merge
Merge