Slighthly improves templates