generator tweaks. small things