phpDoc, some fixes