Update PHPDoc annotations and correct some typo