Fix the PHP Doc comments.
Some more type hinting via the comments.