fixes in templates and evaluations