doc comment cleanup and fixes