Added metrics. Changed output information and format