diff --git a/Makefile b/Makefile
index cb058fd9..837b17d7 100644
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,12 @@ CXXFLAGS += -DFIX_BUGS
 endif
 
 ifeq ($(WINDOWS), 1)
-	ifeq ($(CONSOLE), 1)
+	CXXFLAGS += -DWINDOWS
+	LIBS += -lkernel32
+endif
+
+ifeq ($(CONSOLE), 1)
 	CXXFLAGS += -mconsole
-	endif
-CXXFLAGS += -DWINDOWS
-LIBS += -lkernel32
 endif
 
 CXXFLAGS += `sdl2-config --cflags` `pkg-config freetype2 --cflags`
diff --git a/src/Map.cpp b/src/Map.cpp
index c250f148..28c8b1e1 100644
--- a/src/Map.cpp
+++ b/src/Map.cpp
@@ -206,7 +206,7 @@ void PutMapDataVector(int fx, int fy)
 	
 	//Animate the wind
 	static int count = 0;
-	count++;
+	count += 2;
 	
 	for (int j = put_y; put_y + num_y > j; j++)
 	{
diff --git a/src/MiniMap.cpp b/src/MiniMap.cpp
index 8bae1934..1547c06d 100644
--- a/src/MiniMap.cpp
+++ b/src/MiniMap.cpp
@@ -160,10 +160,7 @@ int MiniMapLoop()
 		}
 
 		PutBitmap4(&grcGame, 0, 0, &grcGame, 10);
-		rcView.left = 160 - f * gMap.width / 16;
-		rcView.right = f * gMap.width / 16 + 160;
-		rcView.top = 120 - f * gMap.length / 16;
-		rcView.bottom = f * gMap.length / 16 + 120;
+		rcView = {(WINDOW_WIDTH / 2) - f * gMap.width / 16, (WINDOW_HEIGHT / 2) - f * gMap.length / 16, (WINDOW_WIDTH / 2) + f * gMap.width / 16, (WINDOW_HEIGHT / 2) + f * gMap.length / 16};
 		PutMapName(true);
 		CortBox(&rcView, 0);
 
diff --git a/src/TextScr.cpp b/src/TextScr.cpp
index ca902689..c1353781 100644
--- a/src/TextScr.cpp
+++ b/src/TextScr.cpp
@@ -11,6 +11,7 @@
 #include "MyChar.h"
 #include "Fade.h"
 #include "Stage.h"
+#include "Frame.h"
 #include "MycParam.h"
 #include "Flags.h"
 #include "Profile.h"
@@ -839,6 +840,33 @@ int TextScriptProc()
 						else
 							gTS.p_read += 13;
 					}
+					else if (IS_COMMAND('S','S','S'))
+					{
+						x = GetTextScriptNo(gTS.p_read + 4);
+						SetNoise(1, x);
+						gTS.p_read += 8;
+					}
+					else if (IS_COMMAND('C','S','S'))
+					{
+						CutNoise();
+						gTS.p_read += 4;
+					}
+					else if (IS_COMMAND('S','P','S'))
+					{
+						SetNoise(2, x);
+						gTS.p_read += 8;
+					}
+					else if (IS_COMMAND('C','P','S'))
+					{
+						CutNoise();
+						gTS.p_read += 4;
+					}
+					else if (IS_COMMAND('Q','U','A'))
+					{
+						z = GetTextScriptNo(gTS.p_read + 4);
+						SetQuake(z);
+						gTS.p_read += 8;
+					}
 					else if (IS_COMMAND('F','A','I'))
 					{
 						z = GetTextScriptNo(gTS.p_read + 4);
@@ -860,6 +888,19 @@ int TextScriptProc()
 						StartMapName();
 						gTS.p_read += 4;
 					}
+					else if (IS_COMMAND('F','O','M'))
+					{
+						z = GetTextScriptNo(gTS.p_read + 4);
+						SetFrameTargetMyChar(z);
+						gTS.p_read += 8;
+					}
+					else if (IS_COMMAND('F','O','N'))
+					{
+						x = GetTextScriptNo(gTS.p_read + 4);
+						y = GetTextScriptNo(gTS.p_read + 9);
+						SetFrameTargetNpChar(x, y);
+						gTS.p_read += 13;
+					}
 					else if (IS_COMMAND('S','O','U'))
 					{
 						z = GetTextScriptNo(gTS.p_read + 4);