diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f11b75
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea/
diff --git a/DNSMasqSpoof/api/module.php b/DNSMasqSpoof/api/module.php
index 6e87dcd..0942bde 100644
--- a/DNSMasqSpoof/api/module.php
+++ b/DNSMasqSpoof/api/module.php
@@ -1,8 +1,5 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
-
 class DNSMasqSpoof extends Module
 {
     public function route()
@@ -44,9 +41,9 @@ class DNSMasqSpoof extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDep($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("dnsmasqspoof.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("dnsmasqspoof.module.installed")));
     }
 
     protected function getDevice()
@@ -67,7 +64,7 @@ class DNSMasqSpoof extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("dnsmasq")) {
+        if (!$this->checkDep("dnsmasq")) {
             $this->execBackground("/pineapple/modules/DNSMasqSpoof/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
diff --git a/DNSMasqSpoof/scripts/autostart_dnsmasqspoof.sh b/DNSMasqSpoof/scripts/autostart_dnsmasqspoof.sh
index 1c9ff60..9fc1eea 100755
--- a/DNSMasqSpoof/scripts/autostart_dnsmasqspoof.sh
+++ b/DNSMasqSpoof/scripts/autostart_dnsmasqspoof.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 if grep addn-hosts /etc/dnsmasq.conf &> /dev/null; then
     /etc/init.d/dnsmasq stop && /etc/init.d/dnsmasq start
   else
diff --git a/DNSMasqSpoof/scripts/dependencies.sh b/DNSMasqSpoof/scripts/dependencies.sh
index 01ca36a..854cd7f 100755
--- a/DNSMasqSpoof/scripts/dependencies.sh
+++ b/DNSMasqSpoof/scripts/dependencies.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 [[ -f /tmp/DNSMasqSpoof.progress ]] && {
   exit 0
 }
diff --git a/DNSMasqSpoof/scripts/dnsmasqspoof.sh b/DNSMasqSpoof/scripts/dnsmasqspoof.sh
index 80f704a..ed28f3a 100755
--- a/DNSMasqSpoof/scripts/dnsmasqspoof.sh
+++ b/DNSMasqSpoof/scripts/dnsmasqspoof.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 if [ "$1" = "start" ]; then
 	echo "no-dhcp-interface=" >> /etc/dnsmasq.conf
 	echo "server=8.8.8.8" >> /etc/dnsmasq.conf
diff --git a/DNSspoof/api/module.php b/DNSspoof/api/module.php
index e785019..0dd7766 100644
--- a/DNSspoof/api/module.php
+++ b/DNSspoof/api/module.php
@@ -1,8 +1,5 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
-
 class DNSspoof extends Module
 {
     public function route()
@@ -62,9 +59,9 @@ class DNSspoof extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDep($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("dnsspoof.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("dnsspoof.module.installed")));
     }
 
     protected function getDevice()
@@ -80,7 +77,7 @@ class DNSspoof extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("dnsspoof")) {
+        if (!$this->checkDep("dnsspoof")) {
             $this->execBackground("/pineapple/modules/DNSspoof/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
diff --git a/DNSspoof/scripts/autostart_dnsspoof.sh b/DNSspoof/scripts/autostart_dnsspoof.sh
index 487d6c7..478644d 100755
--- a/DNSspoof/scripts/autostart_dnsspoof.sh
+++ b/DNSspoof/scripts/autostart_dnsspoof.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 MYTIME=`date +%s`
 MYINTERFACE=`uci get dnsspoof.autostart.interface`
 HOSTSFILE="/etc/pineapple/spoofhost"
diff --git a/DNSspoof/scripts/dependencies.sh b/DNSspoof/scripts/dependencies.sh
index 64fff3b..e85272c 100755
--- a/DNSspoof/scripts/dependencies.sh
+++ b/DNSspoof/scripts/dependencies.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+logger "== DNSSpoof Dependencies Installer"
 
 [[ -f /tmp/DNSspoof.progress ]] && {
   exit 0
diff --git a/DNSspoof/scripts/dnsspoof.sh b/DNSspoof/scripts/dnsspoof.sh
index 7761144..92476a8 100755
--- a/DNSspoof/scripts/dnsspoof.sh
+++ b/DNSspoof/scripts/dnsspoof.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 MYTIME=`date +%s`
 MYINTERFACE=`uci get dnsspoof.run.interface`
 HOSTSFILE="/etc/pineapple/spoofhost"
diff --git a/Deauth/api/module.php b/Deauth/api/module.php
index 17a753f..89c8bb4 100644
--- a/Deauth/api/module.php
+++ b/Deauth/api/module.php
@@ -1,7 +1,7 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
+//putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
+//putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
 
 class Deauth extends Module
 {
@@ -53,9 +53,9 @@ class Deauth extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDep($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("deauth.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("deauth.module.installed")));
     }
 
     protected function getDevice()
@@ -71,7 +71,7 @@ class Deauth extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("mdk3")) {
+        if (!$this->checkDep("mdk3")) {
             $this->execBackground("/pineapple/modules/Deauth/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
@@ -116,7 +116,7 @@ class Deauth extends Module
     private function refreshStatus()
     {
         if (!file_exists('/tmp/Deauth.progress')) {
-            if (!$this->checkDependency("mdk3")) {
+            if (!$this->checkDep("mdk3")) {
                 $installed = false;
                 $install = "Not installed";
                 $installLabel = "danger";
diff --git a/Deauth/scripts/autostart_deauth.sh b/Deauth/scripts/autostart_deauth.sh
index 5c2179e..55565bb 100755
--- a/Deauth/scripts/autostart_deauth.sh
+++ b/Deauth/scripts/autostart_deauth.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 LOG=/tmp/deauth.log
 MYPATH='/pineapple/modules/Deauth/'
diff --git a/Deauth/scripts/deauth.sh b/Deauth/scripts/deauth.sh
index 88cc93c..50141dc 100755
--- a/Deauth/scripts/deauth.sh
+++ b/Deauth/scripts/deauth.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 LOG=/tmp/deauth.log
 MYPATH='/pineapple/modules/Deauth/'
diff --git a/Deauth/scripts/dependencies.sh b/Deauth/scripts/dependencies.sh
index a4acb86..96d084f 100755
--- a/Deauth/scripts/dependencies.sh
+++ b/Deauth/scripts/dependencies.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
+#export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
 
 [[ -f /tmp/Deauth.progress ]] && {
   exit 0
diff --git a/KeyManager/api/module.php b/KeyManager/api/module.php
index bd7d9c7..20282c4 100644
--- a/KeyManager/api/module.php
+++ b/KeyManager/api/module.php
@@ -1,19 +1,17 @@
 <?php namespace pineapple;
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
 
 class KeyManager extends Module
 {
-	public function route()
+    public function route()
     {
         switch ($this->request->action) {
-						case 'refreshInfo':
-								$this->refreshInfo();
-								break;
-						case 'refreshOutput':
+            case 'refreshInfo':
+                $this->refreshInfo();
+                break;
+            case 'refreshOutput':
                 $this->refreshOutput();
                 break;
-						case 'clearOutput':
+            case 'clearOutput':
                 $this->clearOutput();
                 break;
             case 'refreshStatus':
@@ -25,250 +23,217 @@ class KeyManager extends Module
             case 'handleDependenciesStatus':
                 $this->handleDependenciesStatus();
                 break;
-						case 'handleKey':
-							$this->handleKey();
-							break;
-						case 'handleKeyStatus':
-							$this->handleKeyStatus();
-							break;
-						case 'saveKnownHostsData':
-							$this->saveKnownHostsData();
-							break;
-						case 'getKnownHostsData':
-							$this->getKnownHostsData();
-							break;
-						case 'addToKnownHosts':
-							$this->addToKnownHosts();
-							break;
-						case 'addToKnownHostsStatus':
-							$this->addToKnownHostsStatus();
-							break;
-						case 'copyToRemoteHost':
-							$this->copyToRemoteHost();
-							break;
-						case 'copyToRemoteHostStatus':
-							$this->copyToRemoteHostStatus();
-							break;
-						case 'getSettings':
-							$this->getSettings();
-							break;
+            case 'handleKey':
+                $this->handleKey();
+                break;
+            case 'handleKeyStatus':
+                $this->handleKeyStatus();
+                break;
+            case 'saveKnownHostsData':
+                $this->saveKnownHostsData();
+                break;
+            case 'getKnownHostsData':
+                $this->getKnownHostsData();
+                break;
+            case 'addToKnownHosts':
+                $this->addToKnownHosts();
+                break;
+            case 'addToKnownHostsStatus':
+                $this->addToKnownHostsStatus();
+                break;
+            case 'copyToRemoteHost':
+                $this->copyToRemoteHost();
+                break;
+            case 'copyToRemoteHostStatus':
+                $this->copyToRemoteHostStatus();
+                break;
+            case 'getSettings':
+                $this->getSettings();
+                break;
         }
     }
 
-		protected function checkDependency($dependencyName)
-		{
-				return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("keymanager.module.installed")));
-		}
+    protected function checkDep($dependencyName)
+    {
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("keymanager.module.installed")));
+    }
 
-		protected function getDevice()
-		{
-				return trim(exec("cat /proc/cpuinfo | grep machine | awk -F: '{print $2}'"));
-		}
+    protected function getDevice()
+    {
+        return trim(exec("cat /proc/cpuinfo | grep machine | awk -F: '{print $2}'"));
+    }
 
-		protected function refreshInfo()
-		{
-			$moduleInfo = @json_decode(file_get_contents("/pineapple/modules/KeyManager/module.info"));
-			$this->response = array('title' => $moduleInfo->title, 'version' => $moduleInfo->version);
-		}
+    protected function refreshInfo()
+    {
+        $moduleInfo = @json_decode(file_get_contents("/pineapple/modules/KeyManager/module.info"));
+        $this->response = array('title' => $moduleInfo->title, 'version' => $moduleInfo->version);
+    }
 
     private function handleKey()
     {
-		if(!file_exists("/root/.ssh/id_rsa"))
-		{
-	        $this->execBackground("/pineapple/modules/KeyManager/scripts/generate_key.sh");
-	        $this->response = array('success' => true);
-		}
-		else
-		{
-	        exec("rm -rf /root/.ssh/id_rsa*");
-	        $this->response = array('success' => true);
-		}
-	}
+        if (!file_exists("/root/.ssh/id_rsa")) {
+            $this->execBackground("/pineapple/modules/KeyManager/scripts/generate_key.sh");
+            $this->response = array('success' => true);
+        } else {
+            exec("rm -rf /root/.ssh/id_rsa*");
+            $this->response = array('success' => true);
+        }
+    }
 
     private function handleKeyStatus()
     {
-        if (!file_exists('/tmp/KeyManager_key.progress'))
-		{
+        if (!file_exists('/tmp/KeyManager_key.progress')) {
             $this->response = array('success' => true);
-        }
-		else
-		{
+        } else {
             $this->response = array('success' => false);
         }
-	}
+    }
 
     private function handleDependencies()
     {
-		if(!$this->checkDependency("ssh-keyscan"))
-		{
-					$this->execBackground("/pineapple/modules/KeyManager/scripts/dependencies.sh install ".$this->request->destination);
-	        $this->response = array('success' => true);
-		}
-		else
-		{
-	        $this->execBackground("/pineapple/modules/KeyManager/scripts/dependencies.sh remove");
-	        $this->response = array('success' => true);
-		}
-	}
+        if (!$this->checkDep("ssh-keyscan")) {
+            $this->execBackground("/pineapple/modules/KeyManager/scripts/dependencies.sh install " . $this->request->destination);
+            $this->response = array('success' => true);
+        } else {
+            $this->execBackground("/pineapple/modules/KeyManager/scripts/dependencies.sh remove");
+            $this->response = array('success' => true);
+        }
+    }
 
     private function handleDependenciesStatus()
     {
-        if (!file_exists('/tmp/KeyManager.progress'))
-		{
+        if (!file_exists('/tmp/KeyManager.progress')) {
             $this->response = array('success' => true);
-        }
-		else
-		{
+        } else {
             $this->response = array('success' => false);
         }
     }
 
     private function refreshStatus()
     {
-	    if (!file_exists('/tmp/KeyManager.progress'))
-			{
-				if(!$this->checkDependency("ssh-keyscan"))
-				{
-					$installed = false;
-					$install = "Not installed";
-					$installLabel = "danger";
-					$processing = false;
-				}
-				else
-				{
-					$installed = true;
-					$install = "Installed";
-					$installLabel = "success";
-					$processing = false;
-				}
+        if (!file_exists('/tmp/KeyManager.progress')) {
+            if (!$this->checkDep("ssh-keyscan")) {
+                $installed = false;
+                $install = "Not installed";
+                $installLabel = "danger";
+                $processing = false;
+            } else {
+                $installed = true;
+                $install = "Installed";
+                $installLabel = "success";
+                $processing = false;
+            }
 
-		    if (!file_exists('/tmp/KeyManager_key.progress'))
-				{
-					if(!file_exists("/root/.ssh/id_rsa"))
-					{
-						$key = "Not generated";
-						$keyLabel = "danger";
-						$generated = false;
-						$generating = false;
-					}
-					else
-					{
-						$key = "Generated";
-						$keyLabel = "success";
-						$generated = true;
-						$generating = false;
-					}
-				}
-				else
-				{
-					$key = "Generating...";
-					$keyLabel = "warning";
-					$generated = false;
-					$generating = true;
-				}
-	    }
-			else
-			{
-				$installed = false;
-				$install = "Installing...";
-				$installLabel = "warning";
-				$processing = true;
+            if (!file_exists('/tmp/KeyManager_key.progress')) {
+                if (!file_exists("/root/.ssh/id_rsa")) {
+                    $key = "Not generated";
+                    $keyLabel = "danger";
+                    $generated = false;
+                    $generating = false;
+                } else {
+                    $key = "Generated";
+                    $keyLabel = "success";
+                    $generated = true;
+                    $generating = false;
+                }
+            } else {
+                $key = "Generating...";
+                $keyLabel = "warning";
+                $generated = false;
+                $generating = true;
+            }
+        } else {
+            $installed = false;
+            $install = "Installing...";
+            $installLabel = "warning";
+            $processing = true;
 
-				$key = "Not generated";
-				$keyLabel = "danger";
-				$generating = false;
-	    }
+            $key = "Not generated";
+            $keyLabel = "danger";
+            $generating = false;
+        }
 
-			$device = $this->getDevice();
-			$sdAvailable = $this->isSDAvailable();
+        $device = $this->getDevice();
+        $sdAvailable = $this->isSDAvailable();
 
-			$this->response = array("device" => $device, "sdAvailable" => $sdAvailable, "installed" => $installed, "key" => $key, "keyLabel" => $keyLabel, "generating" => $generating, "generated" => $generated, "install" => $install, "installLabel" => $installLabel, "processing" => $processing);
-	}
+        $this->response = array("device" => $device, "sdAvailable" => $sdAvailable, "installed" => $installed, "key" => $key, "keyLabel" => $keyLabel, "generating" => $generating, "generated" => $generated, "install" => $install, "installLabel" => $installLabel, "processing" => $processing);
+    }
 
     private function refreshOutput()
     {
-			if (file_exists("/tmp/keymanager.log"))
-			{
-					$output = file_get_contents("/tmp/keymanager.log");
-					if(!empty($output))
-						$this->response = $output;
-					else
-						$this->response = " ";
-			}
-			else
-			{
-				 $this->response = " ";
-			}
-		}
+        if (file_exists("/tmp/keymanager.log")) {
+            $output = file_get_contents("/tmp/keymanager.log");
+            if (!empty($output))
+                $this->response = $output;
+            else
+                $this->response = " ";
+        } else {
+            $this->response = " ";
+        }
+    }
 
-	private function clearOutput()
-	{
-		exec("rm -rf /tmp/keymanager.log");
-	}
+    private function clearOutput()
+    {
+        exec("rm -rf /tmp/keymanager.log");
+    }
 
-  private function saveKnownHostsData()
-  {
-      $filename = '/root/.ssh/known_hosts';
-			file_put_contents($filename, $this->request->knownHostsData);
-  }
+    private function saveKnownHostsData()
+    {
+        $filename = '/root/.ssh/known_hosts';
+        file_put_contents($filename, $this->request->knownHostsData);
+    }
 
-  private function getKnownHostsData()
-  {
-      $knownHostsData = file_get_contents('/root/.ssh/known_hosts');
-      $this->response = array("knownHostsData" => $knownHostsData);
-  }
+    private function getKnownHostsData()
+    {
+        $knownHostsData = file_get_contents('/root/.ssh/known_hosts');
+        $this->response = array("knownHostsData" => $knownHostsData);
+    }
 
-	private function addToKnownHostsStatus()
-	{
-			if (!file_exists('/tmp/KeyManager.progress'))
-	{
-					$this->response = array('success' => true);
-			}
-	else
-	{
-					$this->response = array('success' => false);
-			}
-	}
+    private function addToKnownHostsStatus()
+    {
+        if (!file_exists('/tmp/KeyManager.progress')) {
+            $this->response = array('success' => true);
+        } else {
+            $this->response = array('success' => false);
+        }
+    }
 
-	private function addToKnownHosts()
-	{
-		$this->uciSet("keymanager.settings.host", $this->request->host);
-		$this->uciSet("keymanager.settings.port", $this->request->port);
+    private function addToKnownHosts()
+    {
+        $this->uciSet("keymanager.settings.host", $this->request->host);
+        $this->uciSet("keymanager.settings.port", $this->request->port);
 
-		$this->execBackground("/pineapple/modules/KeyManager/scripts/add_host.sh");
-		$this->response = array('success' => true);
-	}
+        $this->execBackground("/pineapple/modules/KeyManager/scripts/add_host.sh");
+        $this->response = array('success' => true);
+    }
 
-	private function copyToRemoteHostStatus()
-	{
-			if (!file_exists('/tmp/KeyManager.progress'))
-	{
-					$this->response = array('success' => true);
-			}
-	else
-	{
-					$this->response = array('success' => false);
-			}
-	}
+    private function copyToRemoteHostStatus()
+    {
+        if (!file_exists('/tmp/KeyManager.progress')) {
+            $this->response = array('success' => true);
+        } else {
+            $this->response = array('success' => false);
+        }
+    }
 
-	private function copyToRemoteHost()
-	{
-		$this->uciSet("keymanager.settings.host", $this->request->host);
-		$this->uciSet("keymanager.settings.port", $this->request->port);
-		$this->uciSet("keymanager.settings.user", $this->request->user);
+    private function copyToRemoteHost()
+    {
+        $this->uciSet("keymanager.settings.host", $this->request->host);
+        $this->uciSet("keymanager.settings.port", $this->request->port);
+        $this->uciSet("keymanager.settings.user", $this->request->user);
 
-		$this->execBackground("/pineapple/modules/KeyManager/scripts/copy_key.sh ".$this->request->password);
-		$this->response = array('success' => true);
-	}
+        $this->execBackground("/pineapple/modules/KeyManager/scripts/copy_key.sh " . $this->request->password);
+        $this->response = array('success' => true);
+    }
 
-	private function getSettings()
-	{
-		$settings = array(
-					'host' => $this->uciGet("keymanager.settings.host"),
-					'port' => $this->uciGet("keymanager.settings.port"),
-					'user' => $this->uciGet("keymanager.settings.user")
-					);
-		$this->response = $settings;
-	}
+    private function getSettings()
+    {
+        $settings = array(
+            'host' => $this->uciGet("keymanager.settings.host"),
+            'port' => $this->uciGet("keymanager.settings.port"),
+            'user' => $this->uciGet("keymanager.settings.user")
+        );
+        $this->response = $settings;
+    }
 
 }
diff --git a/KeyManager/scripts/add_host.sh b/KeyManager/scripts/add_host.sh
index 6f0350c..3d6cc27 100755
--- a/KeyManager/scripts/add_host.sh
+++ b/KeyManager/scripts/add_host.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 [[ -f /tmp/KeyManager.progress ]] && {
   exit 0
diff --git a/KeyManager/scripts/copy_key.sh b/KeyManager/scripts/copy_key.sh
index 9504306..29dd4bf 100755
--- a/KeyManager/scripts/copy_key.sh
+++ b/KeyManager/scripts/copy_key.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 [[ -f /tmp/KeyManager.progress ]] && {
   exit 0
diff --git a/KeyManager/scripts/dependencies.sh b/KeyManager/scripts/dependencies.sh
index 8b99297..6e37820 100755
--- a/KeyManager/scripts/dependencies.sh
+++ b/KeyManager/scripts/dependencies.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+logger "== KeyManager Install Script"
 
 [[ -f /tmp/KeyManager.progress ]] && {
   exit 0
diff --git a/KeyManager/scripts/generate_key.sh b/KeyManager/scripts/generate_key.sh
index 1745b97..ac04bc7 100755
--- a/KeyManager/scripts/generate_key.sh
+++ b/KeyManager/scripts/generate_key.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 [[ -f /tmp/KeyManager_key.progress ]] && {
   exit 0
diff --git a/LogManager/api/module.php b/LogManager/api/module.php
index 09b6841..68aad1f 100644
--- a/LogManager/api/module.php
+++ b/LogManager/api/module.php
@@ -1,7 +1,6 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
+
 
 class LogManager extends Module
 {
diff --git a/Occupineapple/api/module.php b/Occupineapple/api/module.php
index fa962c4..b44183e 100644
--- a/Occupineapple/api/module.php
+++ b/Occupineapple/api/module.php
@@ -1,8 +1,5 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
-
 class Occupineapple extends Module
 {
     public function route()
@@ -56,9 +53,9 @@ class Occupineapple extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDeps($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("occupineapple.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("occupineapple.module.installed")));
     }
 
     protected function getDevice()
@@ -74,7 +71,7 @@ class Occupineapple extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("mdk3")) {
+        if (!$this->checkDeps("mdk3")) {
             $this->execBackground("/pineapple/modules/Occupineapple/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
@@ -121,7 +118,7 @@ class Occupineapple extends Module
     private function refreshStatus()
     {
         if (!file_exists('/tmp/Occupineapple.progress')) {
-            if (!$this->checkDependency("mdk3")) {
+            if (!$this->checkDeps("mdk3")) {
                 $installed = false;
                 $install = "Not installed";
                 $installLabel = "danger";
@@ -175,7 +172,7 @@ class Occupineapple extends Module
 
     private function refreshOutput()
     {
-        if ($this->checkDependency("mdk3")) {
+        if ($this->checkDeps("mdk3")) {
             if ($this->checkRunning("mdk3")) {
                 exec("cat /tmp/occupineapple.log", $output);
                 if (!empty($output)) {
diff --git a/Occupineapple/scripts/autostart_occupineapple.sh b/Occupineapple/scripts/autostart_occupineapple.sh
index 7b3d2b4..c2cb97f 100755
--- a/Occupineapple/scripts/autostart_occupineapple.sh
+++ b/Occupineapple/scripts/autostart_occupineapple.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 LOG=/tmp/occupineapple.log
 MYPATH='/pineapple/modules/Occupineapple/'
 
diff --git a/Occupineapple/scripts/dependencies.sh b/Occupineapple/scripts/dependencies.sh
index 6fb5e94..71734b3 100755
--- a/Occupineapple/scripts/dependencies.sh
+++ b/Occupineapple/scripts/dependencies.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 [[ -f /tmp/Occupineapple.progress ]] && {
   exit 0
 }
diff --git a/Occupineapple/scripts/occupineapple.sh b/Occupineapple/scripts/occupineapple.sh
index f557a2a..2835c3a 100755
--- a/Occupineapple/scripts/occupineapple.sh
+++ b/Occupineapple/scripts/occupineapple.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 LOG=/tmp/occupineapple.log
 MYPATH='/pineapple/modules/Occupineapple/'
 
diff --git a/OnlineHashCrack/api/module.php b/OnlineHashCrack/api/module.php
index fc14f14..a019b46 100644
--- a/OnlineHashCrack/api/module.php
+++ b/OnlineHashCrack/api/module.php
@@ -1,6 +1,4 @@
 <?php namespace pineapple;
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
 
 class OnlineHashCrack extends Module
 {
@@ -49,9 +47,9 @@ class OnlineHashCrack extends Module
         }
     }
 
-	protected function checkDependency($dependencyName)
+	protected function checkDeps($dependencyName)
 	{
-		return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("onlinehashcrack.module.installed")));
+		return ($this->checkDependency($dependencyName) && ($this->uciGet("onlinehashcrack.module.installed")));
 	}
 
 	protected function getDevice()
@@ -67,9 +65,9 @@ class OnlineHashCrack extends Module
 
     private function handleDependencies()
     {
-		if(!$this->checkDependency("curl"))
+		if(!$this->checkDeps("curl"))
 		{
-					$this->execBackground("/pineapple/modules/OnlineHashCrack/scripts/dependencies.sh install ".$this->request->destination);
+		    $this->execBackground("/pineapple/modules/OnlineHashCrack/scripts/dependencies.sh install ".$this->request->destination);
 	        $this->response = array('success' => true);
 		}
 		else
@@ -95,7 +93,7 @@ class OnlineHashCrack extends Module
     {
 	    if (!file_exists('/tmp/OnlineHashCrack.progress'))
 		{
-			if(!$this->checkDependency("curl"))
+			if(!$this->checkDeps("curl"))
 			{
 				$installed = false;
 				$install = "Not installed";
diff --git a/OnlineHashCrack/scripts/dependencies.sh b/OnlineHashCrack/scripts/dependencies.sh
index 079bc86..31dd301 100755
--- a/OnlineHashCrack/scripts/dependencies.sh
+++ b/OnlineHashCrack/scripts/dependencies.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 [[ -f /tmp/OnlineHashCrack.progress ]] && {
   exit 0
 }
diff --git a/OnlineHashCrack/scripts/submit_hash.sh b/OnlineHashCrack/scripts/submit_hash.sh
index 47db042..5a570a2 100755
--- a/OnlineHashCrack/scripts/submit_hash.sh
+++ b/OnlineHashCrack/scripts/submit_hash.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 [[ -f /tmp/OnlineHashCrack.progress ]] && {
   exit 0
 }
diff --git a/OnlineHashCrack/scripts/submit_wpa.sh b/OnlineHashCrack/scripts/submit_wpa.sh
index 907d265..7f1c796 100755
--- a/OnlineHashCrack/scripts/submit_wpa.sh
+++ b/OnlineHashCrack/scripts/submit_wpa.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 [[ -f /tmp/OnlineHashCrack.progress ]] && {
   exit 0
 }
diff --git a/Responder/api/module.php b/Responder/api/module.php
index f3f2832..82cedc4 100644
--- a/Responder/api/module.php
+++ b/Responder/api/module.php
@@ -1,8 +1,5 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
-
 class Responder extends Module
 {
     public function route()
@@ -56,9 +53,9 @@ class Responder extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDeps($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("responder.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("responder.module.installed")));
     }
 
     protected function checkRunning($processName)
@@ -79,7 +76,7 @@ class Responder extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("python")) {
+        if (!$this->checkDeps("python")) {
             $this->execBackground("/pineapple/modules/Responder/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
@@ -131,7 +128,7 @@ class Responder extends Module
     private function refreshStatus()
     {
         if (!file_exists('/tmp/Responder.progress')) {
-            if (!$this->checkDependency("python")) {
+            if (!$this->checkDeps("python")) {
                 $installed = false;
                 $install = "Not installed";
                 $installLabel = "danger";
@@ -186,7 +183,7 @@ class Responder extends Module
 
     private function refreshOutput()
     {
-        if ($this->checkDependency("python")) {
+        if ($this->checkDeps("python")) {
             if ($this->checkRunning("Responder.py")) {
                 if (file_exists("/pineapple/modules/Responder/dep/responder/logs/Responder-Session.log")) {
                     if ($this->request->filter != "") {
diff --git a/Responder/scripts/autostart_responder.sh b/Responder/scripts/autostart_responder.sh
index 444a8dd..3b2eb86 100755
--- a/Responder/scripts/autostart_responder.sh
+++ b/Responder/scripts/autostart_responder.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 MYTIME=`date +%s`
 MYINTERFACE=`uci get responder.autostart.interface`
 
diff --git a/Responder/scripts/dependencies.sh b/Responder/scripts/dependencies.sh
index 729ea5b..755232d 100755
--- a/Responder/scripts/dependencies.sh
+++ b/Responder/scripts/dependencies.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 [[ -f /tmp/Responder.progress ]] && {
   exit 0
 }
diff --git a/Responder/scripts/responder.sh b/Responder/scripts/responder.sh
index 66096fd..2c3b597 100755
--- a/Responder/scripts/responder.sh
+++ b/Responder/scripts/responder.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 MYTIME=`date +%s`
 MYINTERFACE=`uci get responder.run.interface`
 
diff --git a/SSLsplit/api/module.php b/SSLsplit/api/module.php
index a720abe..46bdbc4 100644
--- a/SSLsplit/api/module.php
+++ b/SSLsplit/api/module.php
@@ -1,7 +1,6 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
+
 
 class SSLsplit extends Module
 {
@@ -56,9 +55,9 @@ class SSLsplit extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDeps($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("sslsplit.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("sslsplit.module.installed")));
     }
 
     protected function getDevice()
@@ -94,7 +93,7 @@ class SSLsplit extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("sslsplit")) {
+        if (!$this->checkDeps("sslsplit")) {
             $this->execBackground("/pineapple/modules/SSLsplit/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
@@ -135,7 +134,7 @@ class SSLsplit extends Module
     private function refreshStatus()
     {
         if (!file_exists('/tmp/SSLsplit.progress')) {
-            if (!$this->checkDependency("sslsplit")) {
+            if (!$this->checkDeps("sslsplit")) {
                 $installed = false;
                 $install = "Not installed";
                 $installLabel = "danger";
@@ -215,7 +214,7 @@ class SSLsplit extends Module
 
     private function refreshOutput()
     {
-        if ($this->checkDependency("sslsplit")) {
+        if ($this->checkDeps("sslsplit")) {
             if ($this->checkRunning("sslsplit")) {
                 if (file_exists("/pineapple/modules/SSLsplit/connections.log")) {
                     if ($this->request->filter != "") {
diff --git a/SSLsplit/scripts/autostart_sslsplit.sh b/SSLsplit/scripts/autostart_sslsplit.sh
index cf1b8bb..c173cfb4 100755
--- a/SSLsplit/scripts/autostart_sslsplit.sh
+++ b/SSLsplit/scripts/autostart_sslsplit.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 MYTIME=`date +%s`
 
diff --git a/SSLsplit/scripts/dependencies.sh b/SSLsplit/scripts/dependencies.sh
index 15fd18c..6a9b6a8 100755
--- a/SSLsplit/scripts/dependencies.sh
+++ b/SSLsplit/scripts/dependencies.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 [[ -f /tmp/SSLsplit.progress ]] && {
   exit 0
diff --git a/SSLsplit/scripts/generate_certificate.sh b/SSLsplit/scripts/generate_certificate.sh
index 0cf3e65..6a71d97 100755
--- a/SSLsplit/scripts/generate_certificate.sh
+++ b/SSLsplit/scripts/generate_certificate.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 [[ -f /tmp/SSLsplit_certificate.progress ]] && {
   exit 0
diff --git a/SSLsplit/scripts/sslsplit.sh b/SSLsplit/scripts/sslsplit.sh
index a009bce..7df107f 100755
--- a/SSLsplit/scripts/sslsplit.sh
+++ b/SSLsplit/scripts/sslsplit.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 MYTIME=`date +%s`
 
diff --git a/SiteSurvey/api/module.php b/SiteSurvey/api/module.php
index e57237d..f102955 100644
--- a/SiteSurvey/api/module.php
+++ b/SiteSurvey/api/module.php
@@ -1,8 +1,5 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
-
 require_once('/pineapple/modules/SiteSurvey/api/iwlist_parser.php');
 
 class SiteSurvey extends Module
@@ -70,9 +67,9 @@ class SiteSurvey extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDeps($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("sitesurvey.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("sitesurvey.module.installed")));
     }
 
     protected function getDevice()
@@ -93,7 +90,7 @@ class SiteSurvey extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("mdk3")) {
+        if (!$this->checkDeps("mdk3")) {
             $this->execBackground("/pineapple/modules/SiteSurvey/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
@@ -114,7 +111,7 @@ class SiteSurvey extends Module
     private function refreshStatus()
     {
         if (!file_exists('/tmp/SiteSurvey.progress')) {
-            if (!$this->checkDependency("iwlist")) {
+            if (!$this->checkDeps("iwlist")) {
                 $installed = false;
                 $install = "Not installed";
                 $installLabel = "danger";
diff --git a/SiteSurvey/scripts/capture.sh b/SiteSurvey/scripts/capture.sh
index d5095cc..476be90 100755
--- a/SiteSurvey/scripts/capture.sh
+++ b/SiteSurvey/scripts/capture.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 MYTIME=`date +%s`
 LOG=/tmp/SiteSurvey.log
 LOCK=/tmp/SiteSurvey_capture.lock
diff --git a/SiteSurvey/scripts/deauth.sh b/SiteSurvey/scripts/deauth.sh
index 1c8a172..8e0d5a8 100755
--- a/SiteSurvey/scripts/deauth.sh
+++ b/SiteSurvey/scripts/deauth.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 MYTIME=`date +%s`
 LOG=/tmp/SiteSurvey.log
 LOCK=/tmp/SiteSurvey_deauth.lock
diff --git a/SiteSurvey/scripts/dependencies.sh b/SiteSurvey/scripts/dependencies.sh
index f8e0def..6edfc1b 100755
--- a/SiteSurvey/scripts/dependencies.sh
+++ b/SiteSurvey/scripts/dependencies.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+logger "== SITESURVEY INSTALL SCRIPT"
 
 [[ -f /tmp/SiteSurvey.progress ]] && {
   exit 0
@@ -13,8 +12,10 @@ touch /tmp/SiteSurvey.progress
 if [ "$1" = "install" ]; then
   if [ "$2" = "internal" ]; then
 	   opkg update
+	   opkg install mdk3
   elif [ "$2" = "sd" ]; then
-    opkg update
+        opkg update
+        opkg install mdk3 --dest=sd
   fi
 
   touch /etc/config/sitesurvey
diff --git a/Status/api/module.php b/Status/api/module.php
index 45b39c4..ebf3232 100644
--- a/Status/api/module.php
+++ b/Status/api/module.php
@@ -1,7 +1,6 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
+
 
 class Status extends Module
 {
diff --git a/dump1090/api/module.php b/dump1090/api/module.php
index d805c75..235c459 100644
--- a/dump1090/api/module.php
+++ b/dump1090/api/module.php
@@ -1,8 +1,5 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
-
 class dump1090 extends Module
 {
     public function route()
@@ -53,9 +50,9 @@ class dump1090 extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDep($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("dump1090.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("dump1090.module.installed")));
     }
 
     protected function getDevice()
@@ -71,7 +68,7 @@ class dump1090 extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("dump1090")) {
+        if (!$this->checkDep("dump1090")) {
             $this->execBackground("/pineapple/modules/dump1090/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
diff --git a/dump1090/scripts/dependencies.sh b/dump1090/scripts/dependencies.sh
index 1844f9d..16f5860 100755
--- a/dump1090/scripts/dependencies.sh
+++ b/dump1090/scripts/dependencies.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+logger "== DUMP1090 INSTALL SCRIPT"
 
 [[ -f /tmp/dump1090.progress ]] && {
   exit 0
diff --git a/dump1090/scripts/dump1090.sh b/dump1090/scripts/dump1090.sh
index 9df019c..a90235d 100755
--- a/dump1090/scripts/dump1090.sh
+++ b/dump1090/scripts/dump1090.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 MYTIME=`date +%s`
 
 OPTIONS=''
diff --git a/ettercap/api/module.php b/ettercap/api/module.php
index e1578c4..fc4f0f8 100644
--- a/ettercap/api/module.php
+++ b/ettercap/api/module.php
@@ -1,7 +1,6 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
+
 
 class ettercap extends Module
 {
@@ -64,7 +63,7 @@ class ettercap extends Module
 
     protected function checkDependency($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("ettercap.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("ettercap.module.installed")));
     }
 
     protected function getDevice()
diff --git a/ettercap/scripts/dependencies.sh b/ettercap/scripts/dependencies.sh
index 8d8f700..591ccf8 100755
--- a/ettercap/scripts/dependencies.sh
+++ b/ettercap/scripts/dependencies.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 [[ -f /tmp/ettercap.progress ]] && {
   exit 0
diff --git a/ettercap/scripts/ettercap.sh b/ettercap/scripts/ettercap.sh
index 141b8ea..3229c72 100755
--- a/ettercap/scripts/ettercap.sh
+++ b/ettercap/scripts/ettercap.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 MYTIME=`date +%s`
 MYCMD=`cat /tmp/ettercap.run`
diff --git a/ngrep/api/module.php b/ngrep/api/module.php
index 0fcb3cf..d2d52ae 100644
--- a/ngrep/api/module.php
+++ b/ngrep/api/module.php
@@ -1,8 +1,5 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
-
 class ngrep extends Module
 {
     public function route()
@@ -56,9 +53,9 @@ class ngrep extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDeps($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("ngrep.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("ngrep.module.installed")));
     }
 
     protected function getDevice()
@@ -74,7 +71,7 @@ class ngrep extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("ngrep")) {
+        if (!$this->checkDeps("ngrep")) {
             $this->execBackground("/pineapple/modules/ngrep/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
@@ -107,7 +104,7 @@ class ngrep extends Module
     private function refreshStatus()
     {
         if (!file_exists('/tmp/ngrep.progress')) {
-            if (!$this->checkDependency("ngrep")) {
+            if (!$this->checkDeps("ngrep")) {
                 $installed = false;
                 $install = "Not installed";
                 $installLabel = "danger";
@@ -147,7 +144,7 @@ class ngrep extends Module
 
     private function refreshOutput()
     {
-        if ($this->checkDependency("ngrep")) {
+        if ($this->checkDeps("ngrep")) {
             if ($this->checkRunning("ngrep")) {
                 $path = "/pineapple/modules/ngrep/log";
 
diff --git a/ngrep/scripts/dependencies.sh b/ngrep/scripts/dependencies.sh
index c68db49..fc4ce82 100755
--- a/ngrep/scripts/dependencies.sh
+++ b/ngrep/scripts/dependencies.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+logger "== Ngrep Install Script"
 
 [[ -f /tmp/ngrep.progress ]] && {
   exit 0
@@ -19,10 +18,6 @@ if [ "$1" = "install" ]; then
     opkg install ngrep --dest sd
   fi
   
-  if [ ! -f /usr/lib/libpcap.so ] && [ -f /usr/lib/libpcap.so.1.3 ]; then
-  	ln -s /usr/lib/libpcap.so /usr/lib/libpcap.so.1.3
-  fi
-
   touch /etc/config/ngrep
   echo "config ngrep 'module'" > /etc/config/ngrep
 
diff --git a/ngrep/scripts/ngrep.sh b/ngrep/scripts/ngrep.sh
index 03287ab..fd98791 100755
--- a/ngrep/scripts/ngrep.sh
+++ b/ngrep/scripts/ngrep.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 MYTIME=`date +%s`
 MYCMD=`cat /tmp/ngrep.run`
 
diff --git a/nmap/api/module.php b/nmap/api/module.php
index c03146f..ff94358 100644
--- a/nmap/api/module.php
+++ b/nmap/api/module.php
@@ -1,7 +1,7 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
+//putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
+//putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
 
 class nmap extends Module
 {
@@ -44,15 +44,15 @@ class nmap extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDep($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("nmap.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("nmap.module.installed")));
     }
 
-    protected function getDevice()
-    {
-        return trim(exec("cat /proc/cpuinfo | grep machine | awk -F: '{print $2}'"));
-    }
+//    protected function getDevice()
+//    {
+//        return trim(exec("cat /proc/cpuinfo | grep machine | awk -F: '{print $2}'"));
+//    }
 
     protected function refreshInfo()
     {
@@ -62,6 +62,7 @@ class nmap extends Module
 
     private function handleDependencies()
     {
+        error_log("handleDependencies()");
         if (!$this->checkDependency("nmap")) {
             $this->execBackground("/pineapple/modules/nmap/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
@@ -92,9 +93,11 @@ class nmap extends Module
     private function togglenmap()
     {
         if (!$this->checkRunning("nmap")) {
+            error_log("nmap not running");
             $full_cmd = $this->request->command . " -oN /tmp/nmap.scan 2>&1";
             shell_exec("echo -e \"{$full_cmd}\" > /tmp/nmap.run");
 
+            error_log("calling run script");
             $this->execBackground("/pineapple/modules/nmap/scripts/nmap.sh start");
         } else {
             $this->execBackground("/pineapple/modules/nmap/scripts/nmap.sh stop");
diff --git a/nmap/scripts/dependencies.sh b/nmap/scripts/dependencies.sh
index d241041..a6d8612 100755
--- a/nmap/scripts/dependencies.sh
+++ b/nmap/scripts/dependencies.sh
@@ -1,8 +1,10 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+#export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
+#export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
+logger "== RUNNING NMAP INSTALL SCRIPT"
 
 [[ -f /tmp/nmap.progress ]] && {
   exit 0
@@ -19,9 +21,9 @@ if [ "$1" = "install" ]; then
     opkg install nmap --dest sd
   fi
   
-  if [ ! -f /usr/lib/libpcap.so ] && [ -f /usr/lib/libpcap.so.1.3 ]; then
-  	ln -s /usr/lib/libpcap.so /usr/lib/libpcap.so.1.3
-  fi
+#  if [ ! -f /usr/lib/libpcap.so ] && [ -f /usr/lib/libpcap.so.1.3 ]; then
+#  	ln -s /usr/lib/libpcap.so /usr/lib/libpcap.so.1.3
+#  fi
 
   touch /etc/config/nmap
   echo "config nmap 'module'" > /etc/config/nmap
diff --git a/nmap/scripts/nmap.sh b/nmap/scripts/nmap.sh
index 3fb1cf0..ee6d335 100755
--- a/nmap/scripts/nmap.sh
+++ b/nmap/scripts/nmap.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+logger "== STARTING NMAP SCRIPT"
 
 MYTIME=`date +%s`
 MYCMD=`cat /tmp/nmap.run`
diff --git a/p0f/api/module.php b/p0f/api/module.php
index a1ec3a6..0f21aed 100644
--- a/p0f/api/module.php
+++ b/p0f/api/module.php
@@ -1,8 +1,5 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
-
 class p0f extends Module
 {
     public function route()
@@ -50,9 +47,9 @@ class p0f extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDeps($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("p0f.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("p0f.module.installed")));
     }
 
     protected function getDevice()
@@ -68,7 +65,7 @@ class p0f extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("p0f")) {
+        if (!$this->checkDeps("p0f")) {
             $this->execBackground("/pineapple/modules/p0f/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
@@ -120,7 +117,7 @@ class p0f extends Module
     private function refreshStatus()
     {
         if (!file_exists('/tmp/p0f.progress')) {
-            if (!$this->checkDependency("p0f")) {
+            if (!$this->checkDeps("p0f")) {
                 $installed = false;
                 $install = "Not installed";
                 $installLabel = "danger";
@@ -175,7 +172,7 @@ class p0f extends Module
 
     private function refreshOutput()
     {
-        if ($this->checkDependency("p0f")) {
+        if ($this->checkDeps("p0f")) {
             if ($this->checkRunning("p0f")) {
                 $path = "/pineapple/modules/p0f/log";
 
diff --git a/p0f/scripts/autostart_p0f.sh b/p0f/scripts/autostart_p0f.sh
index 75657d9..9450e76 100755
--- a/p0f/scripts/autostart_p0f.sh
+++ b/p0f/scripts/autostart_p0f.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 MYTIME=`date +%s`
 MYINTERFACE=`uci get p0f.autostart.interface`
 
diff --git a/p0f/scripts/dependencies.sh b/p0f/scripts/dependencies.sh
index a947526..84b6d9a 100755
--- a/p0f/scripts/dependencies.sh
+++ b/p0f/scripts/dependencies.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 [[ -f /tmp/p0f.progress ]] && {
   exit 0
 }
diff --git a/p0f/scripts/p0f.sh b/p0f/scripts/p0f.sh
index c641146..1f960be 100755
--- a/p0f/scripts/p0f.sh
+++ b/p0f/scripts/p0f.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 MYTIME=`date +%s`
 MYINTERFACE=`uci get p0f.run.interface`
 
diff --git a/tcpdump/api/module.php b/tcpdump/api/module.php
index cd8f05c..5c4140b 100644
--- a/tcpdump/api/module.php
+++ b/tcpdump/api/module.php
@@ -1,7 +1,6 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
+
 
 class tcpdump extends Module
 {
@@ -47,9 +46,9 @@ class tcpdump extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDeps($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("tcpdump.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("tcpdump.module.installed")));
     }
 
     protected function getDevice()
@@ -65,7 +64,7 @@ class tcpdump extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("tcpdump")) {
+        if (!$this->checkDeps("tcpdump")) {
             $this->execBackground("/pineapple/modules/tcpdump/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
@@ -98,7 +97,7 @@ class tcpdump extends Module
     private function refreshStatus()
     {
         if (!file_exists('/tmp/tcpdump.progress')) {
-            if (!$this->checkDependency("tcpdump")) {
+            if (!$this->checkDeps("tcpdump")) {
                 $installed = false;
                 $install = "Not installed";
                 $installLabel = "danger";
@@ -138,7 +137,7 @@ class tcpdump extends Module
 
     private function refreshOutput()
     {
-        if ($this->checkDependency("tcpdump")) {
+        if ($this->checkDeps("tcpdump")) {
             if (file_exists("/tmp/tcpdump_capture.log")) {
                 $output = file_get_contents("/tmp/tcpdump_capture.log");
                 if (!empty($output)) {
diff --git a/tcpdump/scripts/dependencies.sh b/tcpdump/scripts/dependencies.sh
index ae74f08..6ebce72 100755
--- a/tcpdump/scripts/dependencies.sh
+++ b/tcpdump/scripts/dependencies.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 [[ -f /tmp/tcpdump.progress ]] && {
   exit 0
diff --git a/tcpdump/scripts/tcpdump.sh b/tcpdump/scripts/tcpdump.sh
index 36bda42..12d95cc 100755
--- a/tcpdump/scripts/tcpdump.sh
+++ b/tcpdump/scripts/tcpdump.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 MYTIME=`date +%s`
 MYCMD=`cat /tmp/tcpdump.run`
diff --git a/tor/scripts/dependencies.sh b/tor/scripts/dependencies.sh
index e2bd6fc..b2405c7 100755
--- a/tor/scripts/dependencies.sh
+++ b/tor/scripts/dependencies.sh
@@ -2,8 +2,7 @@
 # author: catatonicprime
 # date: March 2018
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 touch /tmp/tor.progress
 
diff --git a/urlsnarf/api/module.php b/urlsnarf/api/module.php
index 40a20a4..c0b66f6 100644
--- a/urlsnarf/api/module.php
+++ b/urlsnarf/api/module.php
@@ -1,7 +1,6 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
+
 
 class urlsnarf extends Module
 {
@@ -52,7 +51,7 @@ class urlsnarf extends Module
 
     protected function checkDependency($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("urlsnarf.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("urlsnarf.module.installed")));
     }
 
     protected function getDevice()
diff --git a/urlsnarf/scripts/autostart_urlsnarf.sh b/urlsnarf/scripts/autostart_urlsnarf.sh
index 8678667..8f410ef 100755
--- a/urlsnarf/scripts/autostart_urlsnarf.sh
+++ b/urlsnarf/scripts/autostart_urlsnarf.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 MYTIME=`date +%s`
 MYINTERFACE=`uci get urlsnarf.autostart.interface`
diff --git a/urlsnarf/scripts/dependencies.sh b/urlsnarf/scripts/dependencies.sh
index 0b9b168..d117414 100755
--- a/urlsnarf/scripts/dependencies.sh
+++ b/urlsnarf/scripts/dependencies.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 [[ -f /tmp/urlsnarf.progress ]] && {
   exit 0
diff --git a/urlsnarf/scripts/urlsnarf.sh b/urlsnarf/scripts/urlsnarf.sh
index 70d2dc8..b43fd78 100755
--- a/urlsnarf/scripts/urlsnarf.sh
+++ b/urlsnarf/scripts/urlsnarf.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 MYTIME=`date +%s`
 MYINTERFACE=`uci get urlsnarf.run.interface`
diff --git a/wps/api/module.php b/wps/api/module.php
index 45f8112..3f66b7a 100644
--- a/wps/api/module.php
+++ b/wps/api/module.php
@@ -1,8 +1,5 @@
 <?php namespace pineapple;
 
-putenv('LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH').':/sd/lib:/sd/usr/lib');
-putenv('PATH='.getenv('PATH').':/sd/usr/bin:/sd/usr/sbin');
-
 require_once('/pineapple/modules/wps/api/iwlist_parser.php');
 
 class wps extends Module
@@ -70,9 +67,9 @@ class wps extends Module
         }
     }
 
-    protected function checkDependency($dependencyName)
+    protected function checkDeps($dependencyName)
     {
-        return ((exec("which {$dependencyName}") == '' ? false : true) && ($this->uciGet("wps.module.installed")));
+        return ($this->checkDependency($dependencyName) && ($this->uciGet("wps.module.installed")));
     }
 
     protected function getDevice()
@@ -93,7 +90,7 @@ class wps extends Module
 
     private function handleDependencies()
     {
-        if (!$this->checkDependency("reaver")) {
+        if (!$this->checkDeps("reaver")) {
             $this->execBackground("/pineapple/modules/wps/scripts/dependencies.sh install ".$this->request->destination);
             $this->response = array('success' => true);
         } else {
@@ -114,7 +111,7 @@ class wps extends Module
     private function refreshStatus()
     {
         if (!file_exists('/tmp/wps.progress')) {
-            if (!$this->checkDependency("iwlist")) {
+            if (!$this->checkDeps("iwlist")) {
                 $installed = false;
                 $install = "Not installed";
                 $installLabel = "danger";
@@ -166,7 +163,7 @@ class wps extends Module
 
     private function refreshOutput()
     {
-        if ($this->checkDependency("reaver") && $this->checkDependency("bully")) {
+        if ($this->checkDeps("reaver") && $this->checkDeps("bully")) {
             if ($this->checkRunning("reaver") || $this->checkRunning("bully")) {
                 $path = "/pineapple/modules/wps/log";
 
diff --git a/wps/scripts/dependencies.sh b/wps/scripts/dependencies.sh
index 0929345..628372f 100755
--- a/wps/scripts/dependencies.sh
+++ b/wps/scripts/dependencies.sh
@@ -1,9 +1,6 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
-
 [[ -f /tmp/wps.progress ]] && {
   exit 0
 }
diff --git a/wps/scripts/wps.sh b/wps/scripts/wps.sh
index 6aa7d1b..cef2ea4 100755
--- a/wps/scripts/wps.sh
+++ b/wps/scripts/wps.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 #2015 - Whistle Master
 
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/sd/lib:/sd/usr/lib
-export PATH=$PATH:/sd/usr/bin:/sd/usr/sbin
+
 
 MYTIME=`date +%s`
 MYCMD=`cat /tmp/wps.run`