put together reporting and fixed bugs in the view