quick typo fixes and flake8 fixes
pulled in formatting changes from main branch