Cleaned up a bunch of code and fixed a joystick and Scene.reset() bug.