Fix progress_generating and reformat