diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java
index 6d3fbfe9b..04e0c5fd7 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/blobs/Freezing.java
@@ -25,6 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost;
 import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SnowParticle;
 import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
+import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
 import com.watabou.utils.Random;
 
 public class Freezing {
@@ -35,7 +36,11 @@ public class Freezing {
 		
 		Char ch = Actor.findChar( cell ); 
 		if (ch != null) {
-			Buff.prolong( ch, Frost.class, Frost.duration( ch ) * Random.Float( 1.0f, 1.5f ) );
+            if (Level.water[ch.pos] && !ch.flying){
+                Buff.prolong(ch, Frost.class, Frost.duration(ch) * Random.Float(3.0f, 4.5f));
+            } else {
+                Buff.prolong(ch, Frost.class, Frost.duration(ch) * Random.Float(1.0f, 1.5f));
+            }
 		}
 		
 		if (fire != null) {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java
index 9a75ab0b1..5eceb7d90 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/Frost.java
@@ -20,11 +20,13 @@ package com.shatteredpixel.shatteredpixeldungeon.actors.buffs;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
+import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Elemental;
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.food.FrozenCarpaccio;
 import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements.Resistance;
 import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
+import com.watabou.utils.Random;
 
 public class Frost extends FlavourBuff {
 
@@ -36,7 +38,8 @@ public class Frost extends FlavourBuff {
 			
 			target.paralysed = true;
 			Burning.detach( target, Burning.class );
-			
+            if (target instanceof Elemental)
+			    target.damage(Random.IntRange(0, 15), this);
 			if (target instanceof Hero) {
 				Hero hero = (Hero)target;
 				Item item = hero.belongings.randomUnequipped();
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/GasesImmunity.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/GasesImmunity.java
index ccb7a1083..e337197a6 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/GasesImmunity.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/GasesImmunity.java
@@ -24,7 +24,7 @@ import com.shatteredpixel.shatteredpixeldungeon.ui.BuffIndicator;
 
 public class GasesImmunity extends FlavourBuff {
 	
-	public static final float DURATION	= 5f;
+	public static final float DURATION	= 15f;
 	
 	@Override
 	public int icon() {
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java
index 92d46841f..b55a7fb59 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfFrost.java
@@ -57,7 +57,8 @@ public class PotionOfFrost extends Potion {
 	public String desc() {
 		return 
 			"Upon exposure to open air this chemical will evaporate into a freezing cloud, causing " +
-			"any creature that contacts it to be frozen in place unable to act and move.";
+			"any creature that contacts it to be frozen in place unable to act and move." +
+            "The freezing effect is enhanced if the creature is already wet.";
 	}
 	
 	@Override