Added more debugging utilities.