Added some reporting and other updates