Added some improvements to the report!