some generator cleanup; also, more generator options