Better Tokenizer Final 01

Added missing fixes and removed a diagnostic line.