Fix and update docblocks