Fixes, some more logging on the generation process