Evaluator as parameter and some small fixes