diff --git a/lib/register/passes/set_implementation.rb b/lib/register/passes/set_implementation.rb
index 7672abb5..3761e509 100644
--- a/lib/register/passes/set_implementation.rb
+++ b/lib/register/passes/set_implementation.rb
@@ -1,28 +1,28 @@
 Virtual::MessageSlot.class_eval do
   def reg
-    Register::RegisterReference.new(Virtual::Message::MESSAGE_REG )
+    Register::RegisterReference.message_reg
   end
 end
 Virtual::FrameSlot.class_eval do
   def reg
-    Register::RegisterReference.new(Virtual::Message::FRAME_REG )
+    Register::RegisterReference.frame_reg
   end
 end
 Virtual::SelfSlot.class_eval do
   def reg
-    Register::RegisterReference.new(Virtual::Message::SELF_REG )
+    Register::RegisterReference.self_reg
   end
 end
 Virtual::NewMessageSlot.class_eval do
   def reg
-    Register::RegisterReference.new(Virtual::Message::NEW_MESSAGE_REG )
+    Register::RegisterReference.new_message_reg
   end
 end
 
 module Register
-  # This implements setting of the various slot variables the vm defines. 
+  # This implements setting of the various slot variables the vm defines.
   # Basic mem moves, but have to shuffle the type nibbles (TODO!)
-  
+
   class SetImplementation
     def run block
       block.codes.dup.each do |code|
@@ -30,9 +30,9 @@ module Register
         # resolve the register and offset that we need to move to
         to = code.to.reg
         # need a temporay place because of indexed load/store
-        tmp = RegisterReference.new(Virtual::Message::TMP_REG)
+        tmp = RegisterReference.tmp_reg
         # for constants we have to "move" the constants value
-        if( code.from.is_a? Virtual::Constant)
+        if( code.from.is_a? Parfait::Value)
           move1 = LoadConstant.new( tmp , code.from )
         else # while otherwise we "load"
           move1 = GetSlot.new( tmp , code.from.reg , code.from.index )
diff --git a/lib/register/register_reference.rb b/lib/register/register_reference.rb
index c0d0078f..251b098b 100644
--- a/lib/register/register_reference.rb
+++ b/lib/register/register_reference.rb
@@ -6,7 +6,9 @@ module Register
   # In other words a simple level of indirection, or change from value to reference sematics.
 
   class RegisterReference
+
     attr_accessor :symbol
+
     def initialize r
       if( r.is_a? Fixnum)
         r = "r#{r}".to_sym
@@ -39,13 +41,13 @@ module Register
     def self.self_reg
       new SELF_REG
     end
-    def self.messsage_reg
+    def self.message_reg
       new MESSAGE_REG
     end
     def self.frame_reg
       new FRAME_REG
     end
-    def self.new_messsage_reg
+    def self.new_message_reg
       new NEW_MESSAGE_REG
     end
     def self.tmp_reg
diff --git a/lib/virtual/passes/frame_implementation.rb b/lib/virtual/passes/frame_implementation.rb
index 024b675d..8c9306ba 100644
--- a/lib/virtual/passes/frame_implementation.rb
+++ b/lib/virtual/passes/frame_implementation.rb
@@ -17,27 +17,25 @@ module Virtual
     def run block
       block.codes.dup.each do |code|
         if code.is_a?(NewFrame)
-          kind = :next_frame
+          kind = "next_frame"
         elsif code.is_a?(NewMessage)
-          kind = :next_message
+          kind = "next_message"
         else
           next
         end
-        space = Parfait::Space.object_space
-        slot = Virtual::Slot
         # a place to store a reference to the space, we grab the next_frame from the space
-        space_tmp = Register::RegisterReference.new(Virtual::Message::TMP_REG)
+        space_tmp = Register::RegisterReference.tmp_reg
         # a temporary place to store the new frame
         frame_tmp = space_tmp.next_reg_use
         # move the spave to it's register (mov instruction gets the address of the object)
-        new_codes = [ Register::LoadConstant.new( space_tmp , space )]
-        # find index in the space wehre to grab frame/message
-        ind = space.layout[:names].index(kind)
-        raise "index not found for :#{kind}" unless ind
+        new_codes = [ Register::LoadConstant.new( space_tmp , Parfait::Space.object_space )]
+        # find index in the space where to grab frame/message
+        ind = Parfait::Space.object_space.get_layout().index_of( kind )
+        raise "index not found for #{kind}.#{kind.class}" unless ind
         # load the frame/message from space by index
         new_codes << Register::GetSlot.new( frame_tmp , space_tmp , 5 )
         # save the frame in real frame register
-        new_codes << Register::RegisterTransfer.new( Virtual::Message::FRAME_REG , frame_tmp )
+        new_codes << Register::RegisterTransfer.new( Register::RegisterReference.frame_reg , frame_tmp )
         # get the next_frame
         new_codes << Register::GetSlot.new( frame_tmp , frame_tmp , 2 ) # 2 index of next_frame
         # save next frame into space