more reporting

and some other minor edits