[4.2] Fixed Various Docblocks

I think we've got most of the docblocks sorted now!