Improve summary report. Closes #16