couple of cleanups and more docs