Better reporting, inc. bugfix