Lexer refactoring; language screen fix.
Merge.