Changed some stuff to do with the joystick mapping