cleaned kruft, added joystick logic