did more work on the new tokenizer