Added more joystick stuff