2to3; pep8 imports; minor changes