Better Tokenizer Final 02

More forgotten things added (and removed).