diff --git a/lib/battle.py b/lib/battle.py
index c8cdef0..89dd365 100644
--- a/lib/battle.py
+++ b/lib/battle.py
@@ -557,12 +557,13 @@ class Combatant():
             return
         
         self.surges -= 1
+        self.sw -= 1
 
         print '{} got their second wind!'.format(self)
 
         # Now the actual effects of the SW
         self.use_surge()
-        self.add_condition('Second Wind (+2 all def)', 't', 1)
+        self.add_condition('Second Wind (+2 all def)', 't', 1, 's')
 
 
     def use_recharge_power(self, index):
@@ -638,7 +639,7 @@ recharge powers:
 
         return summary.rstrip()
 
-    def format_recharge_summary(self, initial):
+    def format_recharge_summary(self, initial=''):
         summary = ''
         for (index, r) in self.recharges.items():
             summary = summary + '{}{}: {} (Recharge: {}, Available: {})\n'.format(initial, index, r['name'], r['value'], ['Yes', 'No'][ r['used'] ])