diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
index 507c90fa3..880ff18a0 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java
@@ -55,13 +55,36 @@ public class ShatteredPixelDungeon extends Game {
 				com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon.class,
 				"com.shatteredpixel.shatteredpixeldungeon.items.LloydsBeacon" );
 
-		// 0.3.0
+		// 0.3.0, lots of wands
 		com.watabou.utils.Bundle.addAlias(
 				com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfVenom.class,
 				"com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfPoison" );
 		com.watabou.utils.Bundle.addAlias(
 				com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFrost.class,
 				"com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfSlowness" );
+		com.watabou.utils.Bundle.addAlias(
+				com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFireblast.class,
+				"com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFirebolt" );
+		//TODO: add when this one is implemented
+		//com.watabou.utils.Bundle.addAlias(
+		//		com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfCorruption.class,
+		//		"com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfAmok" );
+		com.watabou.utils.Bundle.addAlias(
+				com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlastWave.class,
+				"com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfTelekinesis" );
+		com.watabou.utils.Bundle.addAlias(
+				com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile.class,
+				"com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFlock" );
+		com.watabou.utils.Bundle.addAlias(
+				com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile.class,
+				"com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfAvalanche" );
+		com.watabou.utils.Bundle.addAlias(
+				com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile.class,
+				"com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlink" );
+		com.watabou.utils.Bundle.addAlias(
+				com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile.class,
+				"com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfTeleportation" );
+
 
 
 	}
diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
index d02ea4e9a..fd2dfd51f 100644
--- a/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
+++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java
@@ -114,22 +114,23 @@ public class Generator {
 			PotionOfMight.class,
 			PotionOfFrost.class };
 		Category.POTION.probs = new float[]{ 45, 4, 15, 10, 15, 10, 0, 20, 12, 10, 0, 10 };
-		
-		Category.WAND.classes = new Class<?>[]{ 
-			WandOfTeleportation.class, 
-			WandOfSlowness.class,
-			WandOfFireblast.class,
-			WandOfRegrowth.class,
-			WandOfPoison.class,
-			WandOfBlink.class,
-			WandOfLightning.class,
-			WandOfAmok.class,
-			WandOfTelekinesis.class,
-			WandOfFlock.class,
+
+		//TODO: add last ones when implemented
+		Category.WAND.classes = new Class<?>[]{
 			WandOfMagicMissile.class,
+			WandOfLightning.class,
 			WandOfDisintegration.class,
-			WandOfAvalanche.class };
-		Category.WAND.probs = new float[]{ 10, 10, 15, 6, 10, 11, 15, 10, 6, 10, 0, 5, 5 };
+			WandOfFireblast.class,
+			WandOfVenom.class,
+			WandOfBlastWave.class,
+			//WandOfLivingEarth.class,
+			WandOfFrost.class,
+			WandOfPrismaticLight.class,
+			//WandOfWarding.class,
+			//WandOfTransfusion.class,
+			//WandOfCorruption.class,
+			WandOfRegrowth.class };
+		Category.WAND.probs = new float[]{ 4, 4, 4, 4, 4, 3, /*3,*/ 3, 3, /*3, 3, 3,*/ 3 };
 		
 		Category.WEAPON.classes = new Class<?>[]{ 
 			Dagger.class,