make tokenizer rd forelast commit, now fixing other things...