Worked a bit more on report, added some more cruft