diff --git a/Gemfile.lock b/Gemfile.lock
index 2335ab74..ca7933b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,7 +12,7 @@ GIT
 
 GIT
   remote: git://github.com/salama/salama-reader.git
-  revision: ab0a94bd51c996637453331adeb28bf1731f9b65
+  revision: 6710567af979b0b367245c16a0c6af260675bc71
   specs:
     salama-reader (0.4.0)
       ast (~> 2.1.0)
@@ -20,7 +20,7 @@ GIT
 
 GIT
   remote: git://github.com/whitequark/ast.git
-  revision: 82e280fe0f9d528a581721d02d22d1fbf3755142
+  revision: 3814fb102af82a30bf334005ebe17332744f9dad
   specs:
     ast (2.1.0)
 
diff --git a/lib/phisol/compiler/if_statement.rb b/lib/phisol/compiler/if_statement.rb
index a46ad4cd..4c3a32c5 100644
--- a/lib/phisol/compiler/if_statement.rb
+++ b/lib/phisol/compiler/if_statement.rb
@@ -3,7 +3,7 @@ module Phisol
 #    if - attr_reader  :cond, :if_true, :if_false
 
     def on_if_statement statement
-      condition , if_true , if_false = *statement
+      branch_type , condition , if_true , if_false = *statement
       condition = condition.first
       # to execute the logic as the if states it, the blocks are the other way around
       # so we can the jump over the else if true ,
diff --git a/lib/phisol/compiler/while_statement.rb b/lib/phisol/compiler/while_statement.rb
index 206c17bd..d87e4237 100644
--- a/lib/phisol/compiler/while_statement.rb
+++ b/lib/phisol/compiler/while_statement.rb
@@ -3,7 +3,7 @@ module Phisol
 
     def on_while_statement statement
       #puts statement.inspect
-      condition , statements = *statement
+      branch_type , condition , statements = *statement
       condition = condition.first
 
       # this is where the while ends and both branches meet
diff --git a/lib/register/assembler.rb b/lib/register/assembler.rb
index b06f23ea..b9e6e245 100644
--- a/lib/register/assembler.rb
+++ b/lib/register/assembler.rb
@@ -98,7 +98,7 @@ module Register
         next if objekt.is_a? Parfait::BinaryCode
         write_any( objekt )
       end
-      puts "Assembled #{stream_position} bytes"
+      #puts "Assembled #{stream_position} bytes"
       return @stream.string
     end
 
diff --git a/test/compiler/fragments/test_if.rb b/test/compiler/fragments/test_if.rb
index e9db8e28..e20d0faa 100644
--- a/test/compiler/fragments/test_if.rb
+++ b/test/compiler/fragments/test_if.rb
@@ -8,7 +8,7 @@ class TestIf < MiniTest::Test
 class Object
   int main()
     int n = 10
-    if( n - 12)
+    if_plus( n - 12)
       return 3
     else
       return 4
@@ -25,7 +25,7 @@ HERE
 class Object
   int main()
     int n = 10
-    if(8 - n )
+    if_minus(8 - n )
       "10".putstring()
     end
   end
@@ -41,7 +41,7 @@ HERE
     @string_input = <<HERE
 class Object
   int itest(int n)
-    if( n - 12)
+    if_zero( n - 12)
       "then".putstring()
     else
       "else".putstring()
diff --git a/test/compiler/statements/test_if.rb b/test/compiler/statements/test_if.rb
index 5773890a..39983bbe 100644
--- a/test/compiler/statements/test_if.rb
+++ b/test/compiler/statements/test_if.rb
@@ -8,7 +8,7 @@ class TestIfStatement < MiniTest::Test
     @string_input = <<HERE
 class Object
   int main()
-    if( 10 < 12)
+    if_plus( 10 < 12)
       return 3
     else
       return 4
@@ -28,7 +28,7 @@ HERE
     @string_input = <<HERE
 class Object
   int main()
-    if( 10 < 12)
+    if_minus( 10 < 12)
       return 3
     end
   end
diff --git a/test/compiler/statements/test_while.rb b/test/compiler/statements/test_while.rb
index 49c4f41e..589b1933 100644
--- a/test/compiler/statements/test_while.rb
+++ b/test/compiler/statements/test_while.rb
@@ -9,7 +9,7 @@ module Register
       @string_input    = <<HERE
 class Object
   int main()
-    while(1)
+    while_plus(1)
       return 3
     end
   end
@@ -25,7 +25,7 @@ HERE
 class Object
   int main()
     int n = 5
-    while(n > 0)
+    while_minus(n > 0)
       n = n - 1
     end
   end
@@ -43,7 +43,7 @@ HERE
 class Object
   int main()
     int n = 10
-    while( n > 5)
+    while_notzero( n > 5)
       n = n + 1
       return n
     end
diff --git a/test/interpreter/test_puti.rb b/test/interpreter/test_puti.rb
index 1b328de2..d03ee431 100644
--- a/test/interpreter/test_puti.rb
+++ b/test/interpreter/test_puti.rb
@@ -8,19 +8,19 @@ class AddTest < MiniTest::Test
     @string_input = <<HERE
 class Integer < Object
   Word digit( int rest )
-    if( rest == 5 )
+    if_zero( rest == 5 )
       return "5"
     end
-    if( rest == 1 )
+    if_zero( rest == 1 )
       return "1"
     end
-    if( rest == 2 )
+    if_zero( rest == 2 )
       return "2"
     end
-    if( rest == 3 )
+    if_zero( rest == 3 )
       return "3"
     end
-    if( rest == 4 )
+    if_zero( rest == 4 )
       return "4"
     end
   end
@@ -29,7 +29,7 @@ class Integer < Object
     div = self / 10
     int rest
     rest = self - div
-    if( rest - 0)
+    if_nonzero( rest )
       rest = self.digit( rest )
       str = str + rest
     else
@@ -58,7 +58,7 @@ HERE
 #    Phisol::Compiler.compile( statements , Virtual.machine.space.get_main )
     @interpreter = Interpreter::Interpreter.new
     @interpreter.start Virtual.machine.init
-    # show_ticks # get output of what is
+     #show_ticks # get output of what is
     ["AlwaysBranch","LoadConstant","GetSlot","SetSlot","RegisterTransfer",
      "FunctionCall","SaveReturn","GetSlot","LoadConstant","SetSlot",
      "LoadConstant","SetSlot","RegisterTransfer","FunctionCall","SaveReturn",
@@ -67,24 +67,23 @@ HERE
      "SetSlot","RegisterTransfer","FunctionCall","SaveReturn","GetSlot",
      "LoadConstant","OperatorInstruction","GetSlot","SetSlot","GetSlot",
      "GetSlot","GetSlot","OperatorInstruction","GetSlot","SetSlot",
-     "GetSlot","GetSlot","LoadConstant","OperatorInstruction","IsZeroBranch",
-     "GetSlot","GetSlot","GetSlot","SetSlot","LoadConstant",
-     "SetSlot","GetSlot","SetSlot","RegisterTransfer","FunctionCall",
-     "SaveReturn","GetSlot","LoadConstant","OperatorInstruction","GetSlot",
-     "SetSlot","GetSlot","GetSlot","GetSlot","OperatorInstruction",
-     "GetSlot","SetSlot","GetSlot","GetSlot","LoadConstant",
-     "OperatorInstruction","IsZeroBranch","GetSlot","GetSlot","GetSlot",
-     "SetSlot","LoadConstant","SetSlot","GetSlot","SetSlot",
-     "RegisterTransfer","FunctionCall","SaveReturn","GetSlot","LoadConstant",
-     "OperatorInstruction","GetSlot","SetSlot","GetSlot","GetSlot",
-     "GetSlot","OperatorInstruction","GetSlot","SetSlot","GetSlot",
-     "GetSlot","LoadConstant","OperatorInstruction","IsZeroBranch","GetSlot",
-     "GetSlot","GetSlot","SetSlot","LoadConstant","SetSlot",
-     "GetSlot","SetSlot","RegisterTransfer","FunctionCall","SaveReturn",
-     "GetSlot","LoadConstant","OperatorInstruction","GetSlot","SetSlot",
-     "GetSlot","GetSlot","GetSlot","OperatorInstruction","GetSlot",
-     "SetSlot","GetSlot","GetSlot","LoadConstant","OperatorInstruction",
-     "IsZeroBranch","GetSlot","GetSlot","GetSlot"].each_with_index do |name , index|
+     "GetSlot","GetSlot","IsZeroBranch","GetSlot","GetSlot",
+     "GetSlot","SetSlot","LoadConstant","SetSlot","GetSlot",
+     "SetSlot","RegisterTransfer","FunctionCall","SaveReturn","GetSlot",
+     "LoadConstant","OperatorInstruction","GetSlot","SetSlot","GetSlot",
+     "GetSlot","GetSlot","OperatorInstruction","GetSlot","SetSlot",
+     "GetSlot","GetSlot","IsZeroBranch","GetSlot","GetSlot",
+     "GetSlot","SetSlot","LoadConstant","SetSlot","GetSlot",
+     "SetSlot","RegisterTransfer","FunctionCall","SaveReturn","GetSlot",
+     "LoadConstant","OperatorInstruction","GetSlot","SetSlot","GetSlot",
+     "GetSlot","GetSlot","OperatorInstruction","GetSlot","SetSlot",
+     "GetSlot","GetSlot","IsZeroBranch","GetSlot","GetSlot",
+     "GetSlot","SetSlot","LoadConstant","SetSlot","GetSlot",
+     "SetSlot","RegisterTransfer","FunctionCall","SaveReturn","GetSlot",
+     "LoadConstant","OperatorInstruction","GetSlot","SetSlot","GetSlot",
+     "GetSlot","GetSlot","OperatorInstruction","GetSlot","SetSlot",
+     "GetSlot","GetSlot","IsZeroBranch","GetSlot","GetSlot",
+     "GetSlot"].each_with_index do |name , index|
     got = ticks(1)
     assert got.class.name.index(name) , "Wrong class for #{index+1}, expect #{name} , got #{got}"
 end