added joystick stuff and some other classes