added more debugging tools