phpdoc and whitespace fixes
merge 26868f37b4b189d13020ac4e13c9c5eb51962c66