Small PHPDoc improvements and bugfixes.