TYPOC-34 fix docblocks and descriptions