Hist/PMF reworked + exercise numbers + cosmetic fixes