some fixes in tokenizer and evaluator