Docfixes and cleanup