test waypoints
misc tweaks