diff --git a/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Blocks.java b/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Blocks.java
index e1bdaa86d..1a29e0c57 100644
--- a/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Blocks.java
+++ b/src/main/java/de/bixilon/minosoft/game/datatypes/blocks/Blocks.java
@@ -16,7 +16,7 @@ package de.bixilon.minosoft.game.datatypes.blocks;
 import de.bixilon.minosoft.game.datatypes.Color;
 
 public enum Blocks {
-    UNKNOWN(-1), // the buggy pink black block
+    UNKNOWN(-1), // the buggy pink black block (any other block)
     AIR(0),
     STONE(1),
     GRASS(2),
diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java b/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
index a247f4349..c3b09761f 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/network/Connection.java
@@ -38,7 +38,7 @@ public class Connection {
     final ArrayList<ClientboundPacket> handlingQueue;
     PluginChannelHandler pluginChannelHandler;
     Thread handleThread;
-    ProtocolVersion version = ProtocolVersion.VERSION_1_7_10; // default
+    ProtocolVersion version = Protocol.getLowestVersionSupported(); // default
     Player player;
     ConnectionState state = ConnectionState.DISCONNECTED;
     ConnectionReason reason;
@@ -114,7 +114,7 @@ public class Connection {
             case DISCONNECTED:
                 if (reason == ConnectionReason.GET_VERSION) {
                     //ToDo: only for development, remove later
-                    //setVersion(ProtocolVersion.VERSION_1_9_4);
+                    setVersion(ProtocolVersion.VERSION_1_9_4);
                     setReason(ConnectionReason.CONNECT);
                     connect();
                 }
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java
index e3c3c367a..fbd204109 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketMapData.java
@@ -17,6 +17,7 @@ import de.bixilon.minosoft.logging.Log;
 import de.bixilon.minosoft.protocol.packets.ClientboundPacket;
 import de.bixilon.minosoft.protocol.protocol.InPacketBuffer;
 import de.bixilon.minosoft.protocol.protocol.PacketHandler;
+import de.bixilon.minosoft.protocol.protocol.ProtocolVersion;
 import de.bixilon.minosoft.util.BitByte;
 
 import java.util.ArrayList;
@@ -72,8 +73,12 @@ public class PacketMapData implements ClientboundPacket {
                 }
                 return true;
             case VERSION_1_8:
+            case VERSION_1_9_4: {
                 mapId = buffer.readVarInt();
                 scale = buffer.readByte();
+                if (buffer.getVersion().getVersion() >= ProtocolVersion.VERSION_1_9_4.getVersion()) {
+                    boolean trackPosition = buffer.readBoolean();
+                }
                 int pinCount = buffer.readVarInt();
                 pins = new ArrayList<>();
                 for (int i = 0; i < pinCount; i++) {
@@ -92,6 +97,7 @@ public class PacketMapData implements ClientboundPacket {
                     data = buffer.readBytes(dataLength);
                 }
                 return true;
+            }
         }
 
         return false;
diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java
index 313151c2d..140f7d95a 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/clientbound/play/PacketParticle.java
@@ -51,6 +51,7 @@ public class PacketParticle implements ClientboundPacket {
                 count = buffer.readInteger();
                 return true;
             case VERSION_1_8:
+            case VERSION_1_9_4:
                 particle = Particles.byType(buffer.readInteger());
                 longDistance = buffer.readBoolean();
                 x = buffer.readFloat();