Add some more debugging, cleanup