Fixed various docblocks
Fix log typo in docblock
Merge.