fixing a few awkward waypoints, small graphics changes