finish refactor of air op dialog (for now); bug fixes