adding in more reporting, cleaning things up