Additional docs and some cleanups