Add ability to disable flight when going into a world
Cleanup
IDEA...