Minor changes after Feedback, More work on ScheduledFlight