More edits to Lexer