First draft of setup.py tweaks