Fix missing language
Change path of packages to 3.1/
Remove some old array usages
Test for some special keys