fix docblocks and typehints