tweaks to prototype Generator template(s)