Code standard / PHPdoc fixes.

This will be the last batch of these as there's more useful stuff to do :)