small bugfix and more reporting