small tweaks to generator