More waypoint work, fix CME and somewhat fix rendering