Fixed SDL import
More Joystick stuff