doc, comments fixes