Tidy ups.
Added distutils support.