made a couple more modifications to tokenize