More udpates to setup.py