Py3prep & cleanup & a fix

see commit messages.