changes to model, controller, joystick control