GamePad + small fixes. 

You are making my life easy with the def updates :D