Small changes to FlightPlanner + Survey

Finished Issue: #414 #579 
Issue: #583
Issue: #584