Added more debugging.
Cleanup and more debugging.