Added stuff for axes and hats as well as buttons.