Fix some docblock typo
Consolidate doc block headings.