minor changes, naming and syncing with trunk's fly mode.