Numerous PHPDoc fixes.
Merge pull request #935 from yearofthegus/doctag_fixes

Numerous PHPDoc fixes.