Initial improvements for report, still working on it...