Fix some docblock typo
Fix some docblock type
Cosolidate doc block headers
More doc block corrections.
Consolidate doc block headings.