Fixed various docblocks
Fixed various docblocks
Merge.