chart and template fixes