Removal of some comments, and fix for JoystickInput not exiting cleanly