airline and other small enhancements