fixes, typos, pep8