Correct spellings and PHPDocs