diff --git a/src/client/gui/screens/ChestScreen.cpp b/src/client/gui/screens/ChestScreen.cpp
index c9383c9..8a7b81e 100755
--- a/src/client/gui/screens/ChestScreen.cpp
+++ b/src/client/gui/screens/ChestScreen.cpp
@@ -329,7 +329,10 @@ bool ChestScreen::handleAddItem(FillingContainer* from, FillingContainer* to, in
 		added = (takenItem.count != wantedCount);
 
 		if (added) {
-			item->count -= (wantedCount - takenItem.count);
+			if (!minecraft->isCreativeMode()) {
+				item->count -= (wantedCount - takenItem.count);
+			}
+			
 			std::vector<int> changed;
 			std::vector<const ItemInstance*> items = getItems(toPane);
 			differ.getDiff(items, changed);
diff --git a/src/client/gui/screens/FurnaceScreen.cpp b/src/client/gui/screens/FurnaceScreen.cpp
index 58d6df2..eb9861f 100755
--- a/src/client/gui/screens/FurnaceScreen.cpp
+++ b/src/client/gui/screens/FurnaceScreen.cpp
@@ -500,6 +500,8 @@ ItemInstance FurnaceScreen::moveOver(const ItemInstance* item, int maxCount) {
 		setIfNotSet(doRecreatePane, newSize != oldSize);
 		return removed;
 	}
+	
+
 	return ItemInstance();
 }
 
diff --git a/src/client/model/HumanoidModel.cpp b/src/client/model/HumanoidModel.cpp
index bf004ec..e6515ea 100755
--- a/src/client/model/HumanoidModel.cpp
+++ b/src/client/model/HumanoidModel.cpp
@@ -21,6 +21,9 @@ HumanoidModel::HumanoidModel( float g /*= 0*/, float yOffset /*= 0*/, int texW /
 	texWidth = texW;
 	texHeight = texH;
 
+	// texWidth = 64;
+	// texHeight = 32;
+
 	head.setModel(this);
 	hair.setModel(this);
 	body.setModel(this);
diff --git a/src/client/player/LocalPlayer.cpp b/src/client/player/LocalPlayer.cpp
index 86a345f..29ccf44 100755
--- a/src/client/player/LocalPlayer.cpp
+++ b/src/client/player/LocalPlayer.cpp
@@ -554,9 +554,9 @@ void LocalPlayer::aiStep() {
 
 	//if (onGround && abilities.flying)
 	//	abilities.flying = false;
-	yBobO = yBob;
-	xBobO = xBob;
-	xBob += (xRot - xBob) * 0.5;
+	yBobO = yBob;
+	xBobO = xBob;
+	xBob += (xRot - xBob) * 0.5;
 	yBob += (yRot - yBob) * 0.5;
 
 	if (interpolateOnly())
@@ -774,22 +774,19 @@ void LocalPlayer::startCrafting(int x, int y, int z, int tableSize) {
 
 void LocalPlayer::startStonecutting(int x, int y, int z) {
 #ifndef STANDALONE_SERVER
-	if (!minecraft->isCreativeMode())
-		minecraft->setScreen( new StonecutterScreen() );
+	minecraft->setScreen( new StonecutterScreen() );
 #endif
 }
 
 void LocalPlayer::openFurnace( FurnaceTileEntity* e ) {
 #ifndef STANDALONE_SERVER
-	if (!minecraft->isCreativeMode())
-		minecraft->setScreen( new FurnaceScreen(this, e) );
+	minecraft->setScreen( new FurnaceScreen(this, e) );
 #endif
 }
 
 void LocalPlayer::openContainer( ChestTileEntity* container ) {
 #ifndef STANDALONE_SERVER
-	if (!minecraft->isCreativeMode())
-		minecraft->setScreen( new ChestScreen(this, container) );
+	minecraft->setScreen( new ChestScreen(this, container) );
 #endif
 }
 
diff --git a/src/client/renderer/ItemInHandRenderer.cpp b/src/client/renderer/ItemInHandRenderer.cpp
index fb83bdd..eb2be2b 100755
--- a/src/client/renderer/ItemInHandRenderer.cpp
+++ b/src/client/renderer/ItemInHandRenderer.cpp
@@ -291,14 +291,13 @@ void ItemInHandRenderer::render( float a )
 	Lighting::turnOn(mc);
 	glPopMatrix2();
 
-	 if (localPlayer) // shredder added, basically does the hand swaying animation from b1.8
-	{
-        float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * a;
-        float yrr = localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a;
-		// 4J - was using player->xRot and yRot directly here rather than interpolating between old & current with a
-		float yr = player->yRotO + (player->yRot - player->yRotO) * a;
-        glRotatef((xr - xrr) * 0.1f, 1, 0, 0);
-        glRotatef((yr - yrr) * 0.1f, 0, 1, 0);
+	if (localPlayer) { // shredder added, basically does the hand swaying animation from b1.8 
+        float xrr = localPlayer->xBobO + (localPlayer->xBob - localPlayer->xBobO) * a;
+        float yrr = localPlayer->yBobO + (localPlayer->yBob - localPlayer->yBobO) * a;
+		// 4J - was using player->xRot and yRot directly here rather than interpolating between old & current with a
+		float yr = player->yRotO + (player->yRot - player->yRotO) * a;
+        glRotatef((xr - xrr) * 0.1f, 1, 0, 0);
+        glRotatef((yr - yrr) * 0.1f, 0, 1, 0);
     }
 
 	float br = mc->level->getBrightness(Mth::floor(player->x), Mth::floor(player->y), Mth::floor(player->z));
@@ -425,6 +424,8 @@ void ItemInHandRenderer::render( float a )
 
 		EntityRenderer* er = EntityRenderDispatcher::getInstance()->getRenderer(mc->player);
 		HumanoidMobRenderer* playerRenderer = (HumanoidMobRenderer*) er;
+		EntityRenderDispatcher::getInstance()->setModernSkin((Entity*)(player));
+
 		float ss = 1;
 		glScalef2(ss, ss, ss);
 		playerRenderer->renderHand();
diff --git a/src/client/renderer/entity/EntityRenderDispatcher.cpp b/src/client/renderer/entity/EntityRenderDispatcher.cpp
index b0edea7..9381b89 100755
--- a/src/client/renderer/entity/EntityRenderDispatcher.cpp
+++ b/src/client/renderer/entity/EntityRenderDispatcher.cpp
@@ -137,6 +137,11 @@ void EntityRenderDispatcher::render( Entity* entity, float x, float y, float z,
 	}
 }
 
+void EntityRenderDispatcher::setModernSkin(Entity* player) {
+	PlayerRenderer* rend = (PlayerRenderer*)(getRenderer(player));
+	rend->setModernSkin((Mob*)player);
+}
+
 EntityRenderer* EntityRenderDispatcher::getRenderer( Entity* entity )
 {
 	EntityRendererId rendererId = entity->entityRendererId;
diff --git a/src/client/renderer/entity/EntityRenderDispatcher.h b/src/client/renderer/entity/EntityRenderDispatcher.h
index 06c4eac..180b4ef 100755
--- a/src/client/renderer/entity/EntityRenderDispatcher.h
+++ b/src/client/renderer/entity/EntityRenderDispatcher.h
@@ -45,6 +45,8 @@ public:
     Font* getFont();
 
 	void onGraphicsReset();
+
+	void setModernSkin(Entity* player);
 private:
 	void assign(EntityRendererId id, EntityRenderer* renderer);
 public:
diff --git a/src/client/renderer/entity/PlayerRenderer.cpp b/src/client/renderer/entity/PlayerRenderer.cpp
index 092b9dc..93685fd 100755
--- a/src/client/renderer/entity/PlayerRenderer.cpp
+++ b/src/client/renderer/entity/PlayerRenderer.cpp
@@ -70,13 +70,18 @@ void PlayerRenderer::renderName( Mob* mob, float x, float y, float z ){
 	}
 }
 
-void PlayerRenderer::render(Entity* mob_, float x, float y, float z, float rot, float a) {
-	Mob* mob = (Mob*) mob_;
+// @note fix player skin system
+void PlayerRenderer::setModernSkin(Mob* mob) {
 	HumanoidModel* desired = isModernPlayerSkin(mob) ? playerModel64 : playerModel32;
 	if (model != desired || humanoidModel != desired) {
 		model = desired;
 		humanoidModel = desired;
 	}
+}
+
+void PlayerRenderer::render(Entity* mob_, float x, float y, float z, float rot, float a) {
+	Mob* mob = (Mob*) mob_;
+	setModernSkin(mob);
 	/* LOGI("[PlayerRenderer] %s: skin=%s, modelTex=%dx%d, desired=%s\n", 
 		((Player*)mob)->name.c_str(), mob->getTexture().c_str(), 
 		humanoidModel->texWidth, humanoidModel->texHeight,
diff --git a/src/client/renderer/entity/PlayerRenderer.h b/src/client/renderer/entity/PlayerRenderer.h
index d4b25e2..1105c4b 100755
--- a/src/client/renderer/entity/PlayerRenderer.h
+++ b/src/client/renderer/entity/PlayerRenderer.h
@@ -19,6 +19,8 @@ public:
 
 	virtual void renderName(Mob* mob, float x, float y, float z);
 	virtual void onGraphicsReset();
+
+	void setModernSkin(Mob* mob);
 private:
 	HumanoidModel* playerModel32;
 	HumanoidModel* playerModel64;
diff --git a/src/network/ServerSideNetworkHandler.cpp b/src/network/ServerSideNetworkHandler.cpp
index 2f4abc5..dd9f08f 100755
--- a/src/network/ServerSideNetworkHandler.cpp
+++ b/src/network/ServerSideNetworkHandler.cpp
@@ -162,7 +162,7 @@ void ServerSideNetworkHandler::handle(const RakNet::RakNetGUID& source, MessageP
 	if (player == nullptr) return; // @todo maybe kick?
 	std::string msg = packet->message.C_String();
 
-	if (packet->message[0] == '/') {
+	if (msg[0] == '/') {
 		// This is a command
 
 		ChatPacket resp(minecraft->commandManager().execute(*minecraft, *player, Util::stringTrim(msg.substr(1))));
diff --git a/src/world/level/tile/TallGrass.cpp b/src/world/level/tile/TallGrass.cpp
index dbd3738..5f9743b 100755
--- a/src/world/level/tile/TallGrass.cpp
+++ b/src/world/level/tile/TallGrass.cpp
@@ -44,7 +44,7 @@ int TallGrass::getColor( LevelSource* level, int x, int y, int z ) {
 	int d = level->getData(x, y, z);
 	if (d == DEAD_SHRUB); //return 0xffffff; // i removed this to make it accurate to beta 1.6.6 instead of early java release versions
 	float temp = level->getBiomeSource()->temperatures[0]; // shredder added
-	float rain = level->getBiomeSource()->downfalls[0]; // shredder added
+	float rain = level->getBiomeSource()->downfalls != nullptr ? level->getBiomeSource()->downfalls[0] : 0; // shredder added
 	if (!GrassColor::useTint && d == DEAD_SHRUB){
 		return 0xffffff;
 	}