Fix some typos
Code tweaks
Fix property PHPdoc