even more changes to setup.py