Lots of progress, waypoints removed, etc