Fixed file_iter bug.
Continued cleaning in tokenizer. Not quite done.