final changes + DocBlocks