bug cleaning of evaluator and cli