Changed a module and exception name. Also added some clarifing comments.