improve waypoints a bit