* optimize phpdoc comments and small fixes