Updated doc blocks

As promised, here is a whole set of doc block fixes.