GamePad + small fixes. 

You are making my life easy with the def updates :D
Merge pull request #900 from clark-stevenson/patch-2

GamePad + small fixes.