PHPDoc and small changes