Fixed more PHPDoc plus a couple of typos