Added missing throw annotations
Added missing return annotations
Fixed phpdocs
Some more clean up
Merge pull request #319 from siad007/phpdocs

Fixed a lot of phpdoc issues