Waypoint rendering is correct now, needs to be touched up