more docs and cleanup