Better Tokenizer Fix 01

Some fixes for what should have been tested incrementally.