CRM-12623

Improvements to add some measurement columns and stats.