rework, rename some lexer funcs