Fixes, renames and setup.py