Added TODOs
Updated through InboundFlightInfo. Small fixes.