fixes in evaluator
comment