setup.py and bit of changes