Some code clean-up and progress with loading levels.