Fixed some minor stuff in code. Changed in setup.py script