bunch of tweaks to the tokenizer
bunch of tokenizer fixes