PHPDoc, CS, mistake fixes and other minor improvements

@sandeepone Also need merge to Gleez repo
Here and below to avoid mistakes