more fixes, waypoints now operate under fragments completely