Fixed TODOs so that phpdocumentor can see them

Also regenerated the documentation.