Misc updates including setup.py