Fix setup.py and init slightly