diff --git a/scripts/Data_Settings.rb b/scripts/Data_Settings.rb
index 2073816..a008c41 100644
--- a/scripts/Data_Settings.rb
+++ b/scripts/Data_Settings.rb
@@ -138,11 +138,6 @@ class Window_Settings
       },
     ],
     tr("Video") => [
-      {
-        :type => :bool,
-        :name => tr('Fullscreen'),
-        :parameter => :fullscreen
-      },
       {
         :type => :enum,
         :name => tr('Resolution'),
@@ -150,6 +145,11 @@ class Window_Settings
         :parameter => Graphics::RESOLUTION_OVERRIDDEN ? nil : :resolution,
         :values => Graphics::RESOLUTION_OVERRIDDEN ? ["Resolution is redefined via config"] : Graphics.resolutions_names_list
       },
+      {
+        :type => :bool,
+        :name => tr('Fullscreen'),
+        :parameter => :fullscreen
+      },
       {
         :type => :bool,
         :name => tr('Colorblind mode'),
@@ -193,7 +193,7 @@ class Window_Settings
         :type => :enum,
         :name => tr('FastTravel UI'),
         :parameter => :fasttravel_ui,
-        :values => [tr("Original"), tr("WME")]
+        :values => [tr("Original"), tr("WME (WIP)")]
       },
     ],
     tr("Gameplay") => [
diff --git a/scripts/Game_Map.rb b/scripts/Game_Map.rb
index faf2f94..709f5be 100644
--- a/scripts/Game_Map.rb
+++ b/scripts/Game_Map.rb
@@ -283,11 +283,7 @@ class Game_Map
   def scroll_down(distance)
     return if @display_y_fix
 
-    if self.height < Graphics.height / 28
-    	@display_y = self.height / 2
-    else
-    	@display_y = [@display_y + distance, (self.height - Graphics.height / 28) * 128].min
-    end
+    @display_y = [@display_y + distance, (self.height - Graphics.height / 32 - 1) * 128].min
     @display_y = @display_y.clamp((@display_clip_top * 128.0).to_i, (@display_clip_bottom * 128.0).to_i - Graphics.height * 4)
   end
   #--------------------------------------------------------------------------
@@ -317,11 +313,7 @@ class Game_Map
   def scroll_up(distance)
     return if @display_y_fix
 
-    if self.height < Graphics.height / 28
-      @display_y = self.height / 2
-    else
-   	  @display_y = [@display_y - distance, 0].max
-    end
+   	@display_y = [@display_y - distance, 0].max
     @display_y = @display_y.clamp((@display_clip_top * 128.0).to_i, (@display_clip_bottom * 128.0).to_i - Graphics.height * 4)
   end
   #--------------------------------------------------------------------------
diff --git a/scripts/Spriteset_Map.rb b/scripts/Spriteset_Map.rb
index c7d9be9..41a0edb 100644
--- a/scripts/Spriteset_Map.rb
+++ b/scripts/Spriteset_Map.rb
@@ -203,7 +203,7 @@ class Spriteset_Map
         else
           if @panorama_name == "dark_water"
             @panorama.shader = Shader::Water
-            @panorama.color.set(0, 0, 127, 0)
+            @panorama.color.set(0, 0, 255, 0)
             @panorama.tone.set(0, 0, 255, 63)
             @panorama.blend_type = 1
           elsif @panorama_name == "green_water"