Reporting improved, misc changes