Better comments for cpp-gen
Better file name for groupwise generator