multiple minor refinements plus some new metrics