bug fixes to waypoints and manual control