fix some docblocks and another return