Fix some docblocks
Merging.