Updated requirements in setup.py, small changes