waypoint fixes and adding content