fixes + pep8 testing