pep8 and other fixes