pep 8 fixes and some paths fixes