diff --git a/farms/attack.lua b/farms/attack.lua
index 0ba6805..89e19b1 100644
--- a/farms/attack.lua
+++ b/farms/attack.lua
@@ -2,7 +2,6 @@ local Equipper   = require('turtle.equipper')
 local Point      = require('point')
 local Util       = require('util')
 
-local device     = _G.device
 local os         = _G.os
 local turtle     = _G.turtle
 
@@ -19,14 +18,12 @@ local Runners = {
 }
 
 Equipper.equipLeft('minecraft:diamond_sword')
-Equipper.equipRight('plethora:module:2', 'plethora:scanner')
+local scanner = Equipper.equipRight('plethora:module:2', 'plethora:scanner')
 
-local scanner = device['plethora:scanner']
 local facing = scanner.getBlockMeta(0, 0, 0).state.facing
 turtle.point.heading = Point.facings[facing].heading
 
-Equipper.equipRight('plethora:module:3', 'plethora:sensor')
-local sensor = device['plethora:sensor']
+local sensor = Equipper.equipRight('plethora:module:3', 'plethora:sensor')
 
 turtle.setMovementStrategy('goto')
 turtle.set({ attackPolicy = 'attack' })
diff --git a/farms/farmer.lua b/farms/farmer.lua
index f3943c3..7822616 100644
--- a/farms/farmer.lua
+++ b/farms/farmer.lua
@@ -2,7 +2,6 @@ local Equipper    = require('turtle.equipper')
 local Point       = require('point')
 local Util        = require('util')
 
-local device      = _G.device
 local fs          = _G.fs
 local os          = _G.os
 local peripheral  = _G.peripheral
@@ -18,8 +17,7 @@ local FUEL = Util.transpose {
   'minecraft:blaze_rod:0',
 }
 
-Equipper.equipRight('plethora:module:2', 'plethora:scanner')
-local scanner = device['plethora:scanner']
+local scanner = Equipper.equipRight('plethora:module:2', 'plethora:scanner')
 
 local crops = Util.readTable(CONFIG_FILE) or {
   ['minecraft:wheat'] =
diff --git a/farms/rancher.lua b/farms/rancher.lua
index 9058a0f..716a597 100644
--- a/farms/rancher.lua
+++ b/farms/rancher.lua
@@ -3,7 +3,6 @@ local Config     = require('config')
 local Equipper   = require('turtle.equipper')
 local Util       = require('util')
 
-local device     = _G.device
 local fs         = _G.fs
 local os         = _G.os
 local turtle     = _G.turtle
@@ -31,9 +30,7 @@ local ANIMALS = {
 local animal = ANIMALS[config.animal]
 
 Equipper.equipLeft('minecraft:diamond_sword')
-Equipper.equipRight('plethora:module:3', 'plethora:sensor')
-
-local sensor = device['plethora:sensor']
+local sensor = Equipper.equipRight('plethora:module:3', 'plethora:sensor')
 
 local chest = Adapter({ side = 'bottom', direction = 'up' }) or error('missing chest')
 
diff --git a/farms/spawner.lua b/farms/spawner.lua
index 3734e99..3fd3302 100644
--- a/farms/spawner.lua
+++ b/farms/spawner.lua
@@ -2,7 +2,6 @@ local Equipper   = require('turtle.equipper')
 local Point      = require('point')
 local Util       = require('util')
 
-local device     = _G.device
 local fs         = _G.fs
 local os         = _G.os
 local turtle     = _G.turtle
@@ -12,8 +11,7 @@ local STARTUP_FILE = 'usr/autorun/spawner.lua'
 local mobTypes = { }
 
 Equipper.equipLeft('minecraft:diamond_sword')
-Equipper.equipRight('plethora:module:2', 'plethora:scanner')
-local scanner = device['plethora:scanner']
+local scanner = Equipper.equipRight('plethora:module:2', 'plethora:scanner')
 
 turtle.reset()
 local facing = scanner.getBlockMeta(0, 0, 0).state.facing
@@ -30,8 +28,7 @@ Util.filterInplace(data, function(b)
 end)
 local chest = Point.closest(spawner, data) or error('missing drop off chest')
 
-Equipper.equipRight('plethora:module:3', 'plethora:sensor')
-local sensor = device['plethora:sensor']
+local sensor = Equipper.equipRight('plethora:module:3', 'plethora:sensor')
 
 if not fs.exists(STARTUP_FILE) then
   Util.writeFile(STARTUP_FILE,
diff --git a/farms/treefarm.lua b/farms/treefarm.lua
index f8f018c..3ce6c95 100644
--- a/farms/treefarm.lua
+++ b/farms/treefarm.lua
@@ -1,5 +1,3 @@
-_G.requireInjector(_ENV)
-
 --[[
   Requirements:
     Place turtle against an oak tree or oak sapling
diff --git a/miners/scanningMiner.lua b/miners/scanningMiner.lua
index daf9b6f..963c2b9 100644
--- a/miners/scanningMiner.lua
+++ b/miners/scanningMiner.lua
@@ -19,7 +19,6 @@ local Util     = require('util')
 local colors     = _G.colors
 local fs         = _G.fs
 local os         = _G.os
-local peripheral = _G.peripheral
 local read       = _G.read
 local term       = _G.term
 local turtle     = _G.turtle
@@ -318,8 +317,8 @@ local function collectDrops(suckAction)
 end
 
 local function scan()
-  Equipper.equipLeft('plethora:module:2', 'plethora:scanner')
-  local blocks = peripheral.call('left', 'scan')
+  local scanner = Equipper.equipLeft('plethora:module:2', 'plethora:scanner')
+  local blocks = scanner.scan()
   Equipper.equipLeft('minecraft:diamond_pickaxe')
   local throttle = Util.throttle()
 
@@ -508,8 +507,8 @@ turtle.initialize = function()
 
   --os.sleep(5)
   local pt = GPS.getPoint(2) or error('GPS not found')
-  Equipper.equipLeft('plethora:module:2', 'plethora:scanner')
-  local facing = peripheral.call('left', 'getBlockMeta', 0, 0, 0).state.facing
+  local scanner = Equipper.equipLeft('plethora:module:2', 'plethora:scanner')
+  local facing = scanner.getBlockMeta(0, 0, 0).state.facing
   pt.heading = Point.facings[facing].heading
   turtle.setPoint(pt, true)
   Equipper.equipLeft('minecraft:diamond_pickaxe')
diff --git a/turtle/apis/equipper.lua b/turtle/apis/equipper.lua
index 6fcf72c..5396635 100644
--- a/turtle/apis/equipper.lua
+++ b/turtle/apis/equipper.lua
@@ -41,18 +41,18 @@ local function getEquipped()
     elseif not Equipper.equipped.left then
       local slot = Equipper.unequip('left')
       if slot then
+        turtle.equip('left', slot.name .. ':'  .. slot.damage)
         Equipper.equipped.left = slot.name .. ':'  .. slot.damage
       end
 
     elseif not Equipper.equipped.right then
       local slot = Equipper.unequip('right')
       if slot then
+        turtle.equip('right', slot.name .. ':'  .. slot.damage)
         Equipper.equipped.right = slot.name .. ':'  .. slot.damage
       end
     end
   end
-  _debug("Detected Equipped")
-  _debug(Equipper.equipped)
 end
 
 function Equipper.unequip(side)
@@ -81,7 +81,7 @@ function Equipper.equip(side, invName, equippedName)
 
   -- is it already equipped ?
   if Equipper.equipped[side] == (equippedName or invName) then
-    return
+    return peripheral.getType(side) and peripheral.wrap(side)
   end
   -- is it equipped on other side ?
   if Equipper.equipped[reversed[side]] == (equippedName or invName) then
@@ -95,16 +95,15 @@ function Equipper.equip(side, invName, equippedName)
 
   Equipper.equipped[side] = peripheral.getType(side) or invName
 
-  _debug("Equipped: " .. invName)
-  _debug(Equipper.equipped)
+  return peripheral.getType(side) and peripheral.wrap(side)
 end
 
 function Equipper.equipLeft(invName, equippedName)
-  Equipper.equip('left', invName, equippedName)
+  return Equipper.equip('left', invName, equippedName)
 end
 
 function Equipper.equipRight(invName, equippedName)
-  Equipper.equip('right', invName, equippedName)
+  return Equipper.equip('right', invName, equippedName)
 end
 
 return Equipper
diff --git a/turtle/lavaRefuel.lua b/turtle/lavaRefuel.lua
index 1df0948..957136b 100644
--- a/turtle/lavaRefuel.lua
+++ b/turtle/lavaRefuel.lua
@@ -1,7 +1,6 @@
 local Equipper = require('turtle.equipper')
 local Point    = require('point')
 
-local device     = _G.device
 local peripheral = _G.device
 local turtle     = _G.turtle
 
@@ -16,9 +15,7 @@ if not turtle.has('minecraft:bucket') then
 end
 
 local swapSide = peripheral.getType('right') == 'modem' and 'left' or 'right'
-Equipper.equip(swapSide, 'plethora:module:2', 'plethora:scanner')
-
-local scanner = device['plethora:scanner']
+local scanner = Equipper.equip(swapSide, 'plethora:module:2', 'plethora:scanner')
 
 if not turtle.select('minecraft:bucket') then
 	error('bucket required')