Fixes and update PHPDoc