cleanup and fix docs