Better Tokenizer

Mostly done, except simple word processing. Needs major testing (did not
do incremental testing).