Enhance milestone report, closes #7