Changed the names of the two waypoints, put wp_it back in and fixed warnings in display