Small changes
Small changes to gamepad