Update 2.2.1c

Newer updates and a fix to the joypad system