tokenizer

switched to a stateful tokenizer -- very ugly code, need to
refactor.
reader

Switch to new tokenizer.