Joysticks, cleaning, and bugs

Added joysticks, cleaned up some code.

Fixed bug where any key, not just S, would zoom.