setup.py improved (T.R.)