Add a bunch more fixes, and update to work with the latest pep8