adding in some more debugging gems and cleaning things up