phpdoc fixes & small simplifications