Latest round of edits to substructure histos