More changes to try and make this PyPi ready.