cleanup and first pass on generators-fast option