bunch of pep8 fixes
bunch of changes for christian