exercise counts per workout, more cleanup