fixed eval->evaluator, removed staled comments