more debugging
some cleanups