Misc docs and cleaning