added joystick handling.  fixed issue in original