some generator tweaks