fix waypoint stuff, making it more useful to modify