more small additions to the lexer