diff --git a/src/minecraft/net/minecraft/src/Chunk.java b/src/minecraft/net/minecraft/src/Chunk.java
index fdbd6be..bde37d5 100644
--- a/src/minecraft/net/minecraft/src/Chunk.java
+++ b/src/minecraft/net/minecraft/src/Chunk.java
@@ -581,7 +581,7 @@ public class Chunk
                 var11 = par2 >= var7;
             }
 
-            BigInteger var12 = this.xPosition.shiftLeft(4).add(BigInteger.valueOf(par3));
+            BigInteger var12 = this.xPosition.shiftLeft(4).add(BigInteger.valueOf(par1));
             BigInteger var13 = this.zPosition.shiftLeft(4).add(BigInteger.valueOf(par3));
 
             if (var8 != 0 && !this.worldObj.isRemote)
diff --git a/src/minecraft/net/minecraft/src/RailLogic.java b/src/minecraft/net/minecraft/src/RailLogic.java
index ccbedba..83a4cae 100644
--- a/src/minecraft/net/minecraft/src/RailLogic.java
+++ b/src/minecraft/net/minecraft/src/RailLogic.java
@@ -145,7 +145,7 @@ class RailLogic
 
             var3 = (ChunkPosition)var2.next();
         }
-        while (var3.x != par1RailLogic.trackX || var3.z != par1RailLogic.trackZ);
+        while (!var3.x.equals(par1RailLogic.trackX) || !var3.z.equals(par1RailLogic.trackZ));
 
         return true;
     }
@@ -167,7 +167,7 @@ class RailLogic
 
             var5 = (ChunkPosition)var4.next();
         }
-        while (!var5.x.equals(par1) || var5.z.equals(par3));
+        while (!var5.x.equals(par1) || !var5.z.equals(par3));
 
         return true;
     }
@@ -305,6 +305,8 @@ class RailLogic
         {
             var7 = this.worldObj.getBlockMetadata(this.trackX, this.trackY, this.trackZ) & 8 | var6;
         }
+        
+        System.out.println(var7);
 
         this.worldObj.setBlockMetadataWithNotify(this.trackX, this.trackY, this.trackZ, var7);
     }