Improvements made to Lexer