minor fixes
minor fixes
and phpdoc