more tweaks to geerator templates