Did some more work on waypoints.