Switching to distutils
Fixing some more