plus a few python3 fixes for problem that appeared now that we have more test coverage
This will create a new commit in order to revert the existing changes.
