Gamepad stuff

also some minor changes to keyboard