Improvements on report