Extending setup.py

Extending setup.py. Some small fixes and improvements.