Add airline and a couple more changes