Adding a report done and tweaking small things to get it working