phpdoc fixes and additions