diff --git a/lib/aethyr/core/objects/equipment.rb b/lib/aethyr/core/objects/equipment.rb
index 4d97c5cf8c51dd405e27b966903986aee903d164..9273ff4926361dc71954da9d7d7fb768fe8b6df9 100644
--- a/lib/aethyr/core/objects/equipment.rb
+++ b/lib/aethyr/core/objects/equipment.rb
@@ -7,29 +7,28 @@ class Equipment
   include HasInventory
 
   @@slots = [
+    :left_shoulder,
+    :head,
+    :right_shoulder,
     :left_arm,
+    :torso,
     :right_arm,
-    :head,
+    :left_foot,
+    :legs,
+    :right_foot,
+    :left_hand,
+    :right_hand,
     :face,
     :neck,
     :left_wrist,
     :right_wrist,
     :waist,
-    :left_foot,
-    :right_foot,
-    :left_hand,
-    :right_hand,
     :left_ring_finger,
     :right_ring_finger,
     :left_ear,
     :right_ear,
     :left_ankle,
     :right_ankle,
-    :torso,
-    :arms,
-    :legs,
-    :feet,
-    :hands
     ]
 
   attr_reader :equipment
@@ -203,7 +202,7 @@ class Equipment
     position ||= game_object.position
     position = sym(position)
 
-    if [:arm, :leg, :wield, :wrist, :foot, :ankle, :ring_finger, :ear, :hand].include? position
+    if [:arm, :wield, :wrist, :foot, :ankle, :ring_finger, :ear, :hand, :shoulder].include? position
       return position_of(game_object, "left_#{position}".to_sym) || position_of(game_object, "right_#{position}".to_sym)
     end
 
diff --git a/lib/aethyr/core/render/editor.rb b/lib/aethyr/core/render/editor.rb
index f808869bbe7466614dc544254bba4fbbbd7a7962..0a0154d2acaeb2314d80d5651263ed52b2c139fe 100644
--- a/lib/aethyr/core/render/editor.rb
+++ b/lib/aethyr/core/render/editor.rb
@@ -116,7 +116,7 @@ module Editor
   #
   #Basically just colors the output.
   def editor_out message
-    self.puts "<editor>#{message}</editor>"
+    self.send_puts "<editor>#{message}</editor>"
   end
 
   #Replace a line in the buffer.