Order in lang file, minor fixes around phpdoc