Improvements to the pypi branch

if you look at the commits one by one they are self-explanatory
Ok! Just saw the commit message explaining your reasons. Fair enough.