Language file can be separated into more files

Lots of bug fixes