Lots of changes to work with pypi