Improved Lexer a little bit.