more and cleanups