waypoint tweaks