Fixed Docblocs

Refreshed version of #2197 

Needs review as this was auto-generated.