doc block corrections, remove @package
Merge pull request #1647 from dereuromark/3.0-doc-blocks

3.0 doc blocks