+ multiworld flight support
? refactoring