Handled some errors correctly, fixed pep8