More refactoring of language structure, language strings per #151
More language strings, per #151