phpdoc and whitespace fixes
merge 402f0fcd16a7116bd5a1255c08d406ff7c797d9f