fix setup.py and a few imports