ignore more
pep8
pep8
stylistic cleanup & minor bugfixes
cleanup and testcase for retry