diff --git a/letsencrypt/client/augeas_configurator.py b/letsencrypt/client/augeas_configurator.py
index d2f6c6b44..1b7c9f9ce 100644
--- a/letsencrypt/client/augeas_configurator.py
+++ b/letsencrypt/client/augeas_configurator.py
@@ -62,7 +62,7 @@ class AugeasConfigurator(configurator.Configurator):
         except:
             # Check for the root of save problems
             new_errs = self.aug.match("/augeas//error")
-            logger.error("During Save - " + mod_conf)
+            # logger.error("During Save - " + mod_conf)
             # Only print new errors caused by recent save
             for err in new_errs:
                 if err not in ex_errs:
diff --git a/letsencrypt/client/client.py b/letsencrypt/client/client.py
index 41c966100..401cc2963 100644
--- a/letsencrypt/client/client.py
+++ b/letsencrypt/client/client.py
@@ -427,8 +427,9 @@ class Client(object):
         for combo in combos:
             for c in combo:
                 combo_total += chall_cost.get(challenges[c]["type"], max_cost)
-            if combo_total < best_combo_total:
+            if combo_total < best_combo_cost:
                 best_combo = combo
+                best_combo_cost = combo_total
             combo_total = 0
 
         if not best_combo:
@@ -557,7 +558,7 @@ class Client(object):
 
             elif challenges[c]["type"] == "recoveryToken":
                 logger.info("\tRecovery Token Challenge for name: %s." % name)
-                challenge_objs_indicies.append(c)
+                challenge_obj_indicies.append(c)
                 challenge_objs.append({type:"recoveryToken"})
 
             else:
@@ -743,7 +744,8 @@ def renew(config):
         cert = M2Crypto.X509.load_cert(tup[0])
         issuer = cert.get_issuer()
         if recognized_ca(issuer):
-            generate_renewal_req()
+            pass
+            # generate_renewal_req()
 
         # Wait for response, act accordingly
     gen_req_from_cert()
diff --git a/letsencrypt/client/display.py b/letsencrypt/client/display.py
index 4c1633776..d04f3785f 100644
--- a/letsencrypt/client/display.py
+++ b/letsencrypt/client/display.py
@@ -97,7 +97,7 @@ class NcursesDisplay(Display):
                            width = WIDTH, height = HEIGHT)
             return c, str(selection)
         else:
-            choices = [((i + 1), c) for c in choices]
+            choices = list(enumerate(choices, 1))
             code, s = self.d.menu(message, choices = choices,
                                width = WIDTH, height = HEIGHT)
 
diff --git a/letsencrypt/client/interactive_challenge.py b/letsencrypt/client/interactive_challenge.py
index 7d3c8d062..467403328 100644
--- a/letsencrypt/client/interactive_challenge.py
+++ b/letsencrypt/client/interactive_challenge.py
@@ -20,16 +20,16 @@ class Interactive_Challenge(challenge.Challenge):
 
     def perform(self, quiet=True):
         if quiet:
-            dialog.Dialog().msgbox(get_display_string(), width=BOX_SIZE)
+            dialog.Dialog().msgbox(self.get_display_string(), width=self.BOX_SIZE)
         else:
-            print get_display_string()
+            print self.get_display_string()
             raw_input('')
 
         return True
 
 
     def get_display_string(self):
-        return textwrap.fill(self.string, width=BOX_SIZE) + "\n\nPlease Press Enter to Continue"
+        return textwrap.fill(self.string, width=self.BOX_SIZE) + "\n\nPlease Press Enter to Continue"
 
     def formatted_reasons(self):
         return "\n\t* %s\n", self.reason
diff --git a/letsencrypt/client/recovery_contact_challenge.py b/letsencrypt/client/recovery_contact_challenge.py
index 65f6940a0..7e0a26693 100644
--- a/letsencrypt/client/recovery_contact_challenge.py
+++ b/letsencrypt/client/recovery_contact_challenge.py
@@ -27,7 +27,7 @@ class RecoveryContact(challenge.Challenge):
 
         else:
             print self.get_display_string()
-            if successURL:
+            if self.successURL:
                 return self.poll(10, quiet)
             else:
                 self.token = raw_input("Enter the recovery token:")