More phpdoc cleanup, see #11