Incorporating some changes I had made to the app

I thought I had done some more in terms of the reports, but it
seems that I had not...

Signed-off-by: Elliot Voris <elliotfriend@gmail.com>