Made joystick inputs use gamepad mappings if possible. Reimplemented arrow button and locking