Dev

Dev fixes to tokenizer.