Fixes, Cleanup, Comments, Joystick support