fixes and pep8