cleanup and doc-fix