Fixing up multiple return params and finishing PHPDocs