Fixed some formatting issues, added totals.