more pep8/python3 fixes