PHPDoc Fixes

I fixed a large number of PHPDoc and typehinting issues. Now PHPStorm should be happier.