PHPDoc Improvements (part 1)