Added joystick support and changed some more