Working on report, formatting changes