Fixed bugs in evaluator...