* some more evaluator improvements