Added joystick support and updated comments