more work aligning with pypi