More fixed and additions to template_overview