Beefed up setup.py