updates to lexer