diff --git a/JGE/lib/win/jge_debug.lib b/JGE/lib/win/jge_debug.lib
index 381040434..9c2742d07 100644
Binary files a/JGE/lib/win/jge_debug.lib and b/JGE/lib/win/jge_debug.lib differ
diff --git a/JGE/src/JAudio.cpp b/JGE/src/JAudio.cpp
index 3133375e0..011bc44bb 100644
--- a/JGE/src/JAudio.cpp
+++ b/JGE/src/JAudio.cpp
@@ -388,11 +388,15 @@ void audioInit()  // 
 		p_currentWav[i] = NULL;
 	}
   JMP3::init();
+  pspAudioInit();
+	pspAudioSetChannelCallback(0, audioOutCallback_0, NULL);
+	pspAudioSetChannelCallback(1, audioOutCallback_1, NULL);
+	pspAudioSetChannelCallback(2, audioOutCallback_2, NULL);
 }
 
 void audioDestroy()
 {
-	
+	pspAudioEnd();
 }
 
 
diff --git a/projects/mtg/Makefile.3xx b/projects/mtg/Makefile.3xx
index 019882827..0d0ad4ab3 100644
--- a/projects/mtg/Makefile.3xx
+++ b/projects/mtg/Makefile.3xx
@@ -1,5 +1,5 @@
 TARGET = template
-OBJS = src/ActionElement.o src/ActionLayer.o src/ActionStack.o src/AIPlayer.o src/AIStats.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/CardDisplay.o  src/ConstraintResolver.o src/Counters.o src/Damage.o src/DamagerDamaged.o src/DamageResolverLayer.o src/DeckDataWrapper.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameOptions.o src/GameStateDuel.o src/GameStateOptions.o src/GameStateShop.o src/GuiCardsController.o src/GuiLayers.o src/Logger.o src/ManaCost.o src/ManaCostHybrid.o  src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/MTGRules.o src/OptionItem.o src/PhaseRing.o src/Player.o src/PlayerData.o  src/PlayGuiObjectController.o src/PlayGuiObject.o src/PriceList.o src/ShopItem.o  src/SimpleMenu.o src/SimpleMenuItem.o src/Subtypes.o src/TargetChooser.o src/TargetsList.o src/TexturesCache.o src/utils.o 
+OBJS = src/ActionElement.o src/ActionLayer.o src/ActionStack.o src/AIPlayer.o src/AIStats.o src/Blocker.o src/CardGui.o src/CardDescriptor.o src/CardDisplay.o  src/ConstraintResolver.o src/Counters.o src/Damage.o src/DamagerDamaged.o src/DamageResolverLayer.o src/DeckDataWrapper.o src/DeckStats.o src/DuelLayers.o src/GameApp.o src/GameLauncher.o src/GameObserver.o src/GameOptions.o src/GameStateDuel.o src/GameStateOptions.o src/GameStateShop.o src/GuiCardsController.o src/GuiLayers.o src/Logger.o src/ManaCost.o src/ManaCostHybrid.o  src/MenuItem.o src/MTGAbility.o src/MTGCardInstance.o src/MTGCard.o src/MTGDeck.o src/MTGGamePhase.o src/MTGGameZones.o src/MTGGuiHand.o src/MTGGuiPlay.o src/MTGRules.o src/OptionItem.o src/PhaseRing.o src/Player.o src/PlayerData.o  src/PlayGuiObjectController.o src/PlayGuiObject.o src/PriceList.o src/ShopItem.o  src/SimpleMenu.o src/SimpleMenuItem.o src/Subtypes.o src/TargetChooser.o src/TargetsList.o src/TexturesCache.o src/utils.o 
 
 
 
diff --git a/projects/mtg/bin/Res/settings/options.txt b/projects/mtg/bin/Res/settings/options.txt
index df2bddd85..4eb2bf18b 100644
--- a/projects/mtg/bin/Res/settings/options.txt
+++ b/projects/mtg/bin/Res/settings/options.txt
@@ -1,50 +1,50 @@
-0
-100
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
-0
+0
+100
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
diff --git a/projects/mtg/bin/Res/sound/sfx/artifact.wav b/projects/mtg/bin/Res/sound/sfx/artifact.wav
index 061f57c26..21a276a16 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/artifact.wav and b/projects/mtg/bin/Res/sound/sfx/artifact.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/bear.wav b/projects/mtg/bin/Res/sound/sfx/bear.wav
index 1752c196c..8e6cec17d 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/bear.wav and b/projects/mtg/bin/Res/sound/sfx/bear.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/beast.wav b/projects/mtg/bin/Res/sound/sfx/beast.wav
index 12568e4c7..af355a80f 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/beast.wav and b/projects/mtg/bin/Res/sound/sfx/beast.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/cat.wav b/projects/mtg/bin/Res/sound/sfx/cat.wav
index 370ec772a..c5c304ad7 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/cat.wav and b/projects/mtg/bin/Res/sound/sfx/cat.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/creature.wav b/projects/mtg/bin/Res/sound/sfx/creature.wav
index defb14f89..4059f3856 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/creature.wav and b/projects/mtg/bin/Res/sound/sfx/creature.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/dragon.wav b/projects/mtg/bin/Res/sound/sfx/dragon.wav
index 2a336f8f1..6538f588e 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/dragon.wav and b/projects/mtg/bin/Res/sound/sfx/dragon.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/enchantment.wav b/projects/mtg/bin/Res/sound/sfx/enchantment.wav
index 78966ff28..4849c6544 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/enchantment.wav and b/projects/mtg/bin/Res/sound/sfx/enchantment.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/faerie.wav b/projects/mtg/bin/Res/sound/sfx/faerie.wav
index c2ca50ff7..d23f91237 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/faerie.wav and b/projects/mtg/bin/Res/sound/sfx/faerie.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/flying.wav b/projects/mtg/bin/Res/sound/sfx/flying.wav
index 327c7637e..c21ed1e41 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/flying.wav and b/projects/mtg/bin/Res/sound/sfx/flying.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/goblin.wav b/projects/mtg/bin/Res/sound/sfx/goblin.wav
index 6c26e0a79..29eb223d2 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/goblin.wav and b/projects/mtg/bin/Res/sound/sfx/goblin.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/graveyard.wav b/projects/mtg/bin/Res/sound/sfx/graveyard.wav
index e9260c123..9e909e41a 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/graveyard.wav and b/projects/mtg/bin/Res/sound/sfx/graveyard.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/human.wav b/projects/mtg/bin/Res/sound/sfx/human.wav
index 28cbe3cad..20fd8ce51 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/human.wav and b/projects/mtg/bin/Res/sound/sfx/human.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/imp.wav b/projects/mtg/bin/Res/sound/sfx/imp.wav
index d5935fb48..836b8ceaa 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/imp.wav and b/projects/mtg/bin/Res/sound/sfx/imp.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/instant.wav b/projects/mtg/bin/Res/sound/sfx/instant.wav
index 9d258508a..bd491e0be 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/instant.wav and b/projects/mtg/bin/Res/sound/sfx/instant.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/knight.wav b/projects/mtg/bin/Res/sound/sfx/knight.wav
index 02b51e607..8fe36b7ed 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/knight.wav and b/projects/mtg/bin/Res/sound/sfx/knight.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/sorcery.wav b/projects/mtg/bin/Res/sound/sfx/sorcery.wav
index 469bbcd97..a61f75ca9 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/sorcery.wav and b/projects/mtg/bin/Res/sound/sfx/sorcery.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/troll.wav b/projects/mtg/bin/Res/sound/sfx/troll.wav
index 482ab9ac1..416994b3b 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/troll.wav and b/projects/mtg/bin/Res/sound/sfx/troll.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/vampire.wav b/projects/mtg/bin/Res/sound/sfx/vampire.wav
index 3a7386bcf..6ba3ded15 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/vampire.wav and b/projects/mtg/bin/Res/sound/sfx/vampire.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/wurm.wav b/projects/mtg/bin/Res/sound/sfx/wurm.wav
index 556d7258b..64a1e827a 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/wurm.wav and b/projects/mtg/bin/Res/sound/sfx/wurm.wav differ
diff --git a/projects/mtg/bin/Res/sound/sfx/zombie.wav b/projects/mtg/bin/Res/sound/sfx/zombie.wav
index d95b9d922..442d0db13 100644
Binary files a/projects/mtg/bin/Res/sound/sfx/zombie.wav and b/projects/mtg/bin/Res/sound/sfx/zombie.wav differ
diff --git a/projects/mtg/include/SimpleMenuItem.h b/projects/mtg/include/SimpleMenuItem.h
index b88bddc29..322956dc2 100644
--- a/projects/mtg/include/SimpleMenuItem.h
+++ b/projects/mtg/include/SimpleMenuItem.h
@@ -4,6 +4,9 @@
 #include <string>
 #include <JLBFont.h>
 #include <JGui.h>
+#include <string>
+
+using std::string;
 
 #define SCALE_SELECTED		1.2f
 #define SCALE_NORMAL		1.0f
diff --git a/projects/mtg/src/GameStateDuel.cpp b/projects/mtg/src/GameStateDuel.cpp
index 73e6aad12..c8c59b6f9 100644
--- a/projects/mtg/src/GameStateDuel.cpp
+++ b/projects/mtg/src/GameStateDuel.cpp
@@ -19,6 +19,7 @@ GameStateDuel::GameStateDuel(GameApp* parent): GameState(parent) {
   game = NULL;
   deckmenu = NULL;
   opponentMenu = NULL;
+  opponentMenuFont = NULL;
   menu = NULL;
 #ifdef TESTSUITE
   testSuite = NULL;