add more lexer tokens; unit tests currently broken