Fix phpdoc and comments