added evaluator, tweaked experiment code