Fixed up a lot of how reports works.  More robust, and easier to read