Many small bugfixes in the reporting