some tweaks on templates.