more lexer updates