fix various formatting nits in CMP contribution chunks 1-6 found by the new util...