Better Tokenizer Fix 04

Forgive all these commits. I'd rather not edit through terminals.