More formatting changes and improvements
more additions to report generation