Got rid of some small print bugs, testing waypoints