pep8
misc fixes