minor tweak to modules1
minor tweaks to templates