cleanup and more docs