more reporting work

plus bugfixes throughout