Fixed some pep-ish issues as well as defined failure better.
Fixed some pep-ish issues as well as defined failure better.