Waypoints and missionlib: lot's of cleanup
Navigator: Small error message fix