format changes only
Added more debugging tools when in DEBUG mode