Updated debugging tools, added more debugging