Comments & PHPdocs changed