more work on gamepad support