minor changes to evaluator