Added joystick support and correct key mapping