Working on report and tweaking things