More fixes

Fixed joypad interface typo and forcing key names to upper case.