schema fixes, templates, header