Fixed a bunch of py2 and setup.py problems