Finished some more Airways logic code. Bug fixes.