more templates & minor tweaks