Added additional metrics and tidied up the formatting and display.