A lot done! Most importantly, the flight logical ordering should be fixed.