Cleanup and more debugging