tweaks on template