diff --git a/py/Airmon.py b/py/Airmon.py
index 6ffb3f0..5fdb382 100644
--- a/py/Airmon.py
+++ b/py/Airmon.py
@@ -3,6 +3,7 @@
 from Interface import Interface
 from Process import Process
 from Color import Color
+from Configuration import Configuration
 
 class Airmon(object):
     ''' Wrapper around the 'airmon-ng' program '''
@@ -99,6 +100,9 @@ class Airmon(object):
 
         # No errors found; the device 'mon_iface' was put into MM.
         Color.pl("{G}enabled {C}%s{W}" % mon_iface)
+
+        Configuration.interface = mon_iface
+
         return mon_iface
 
 
@@ -159,7 +163,7 @@ class Airmon(object):
         if a.get(choice).name in mon_ifaces:
             Color.pl('{+} {G}%s{W} is already in monitor mode' % iface.name)
         else:
-            Airmon.start(iface)
+            iface.name = Airmon.start(iface)
         return iface.name
 
 
diff --git a/py/Scanner.py b/py/Scanner.py
index f026ea3..b8bbd3c 100644
--- a/py/Scanner.py
+++ b/py/Scanner.py
@@ -39,10 +39,10 @@ class Scanner(object):
                                        [len(t.clients)
                                            for t in self.targets])
                     Color.p(
-                        "\r{+} scanning, " +
-                        "found {G}%d{W} target(s)," % target_count +
-                        " {G}%d{W} clients" % client_count +
-                        ". {O}Ctrl+C{W} when ready")
+                        '\r{+} scanning, found' +
+                        ' {G}%d{W} target(s),' % target_count +
+                        ' {G}%d{W} clients.' % client_count +
+                        ' {O}Ctrl+C{W} when ready')
                     sleep(1)
                     self.targets = airodump.get_targets()
                     self.print_targets()