More fixes/missing language id added