Updates to Setup.py