Fix some namespace/parameters in phpdocs
Additional phpdoc fixes
fix namespace
Fix a couple alignments.