fixes in evaluation and template