generator template tweaks/improvements