some small changes in evaluator and num