Some changes to token accuracy evaluator