Cleaned up debug text and added a few more failure types