Pep8, exceptions, some other fixes