Further updates and fixes for new joystick