Added more debugging tools