working on a rewrite of the tokenizer
a few updates to the tokenizer, should be faster and easier to modify in the future