working on gamepad fixes