Added more debugging capabilities