Update PhpDoc and fix Closure