went through all templates and fixed the majority of issues I found