Update setup.py and defaults changes