Minor fixes
- Added DocBlocks
- Added DocBlocks