waypoint fixes

guhhh, leftovers from last night