fixing waypoints and so on...