Fixing waypoints and more interface stuff.