Add more summary metrics and refactory summary printing code.