more lexer work