PHPDoc updated and typos fixed while reviewing