diff --git a/scripts/Doc_Message.rb b/scripts/Doc_Message.rb
index 26fd329..3f2b363 100644
--- a/scripts/Doc_Message.rb
+++ b/scripts/Doc_Message.rb
@@ -9,14 +9,26 @@ class Doc_Message
   def initialize
     @viewport = Viewport.new(0, 0, 640, 480)
     @sprite_bg = Sprite.new(@viewport)
-	if $game_switches[124] == true
-	  @sprite_bg.bitmap = RPG::Cache.picture('lined_paper_red')
-	else
+    @sprite_scroll_up = Sprite.new(@viewport)
+    @sprite_scroll_down = Sprite.new(@viewport)
+  	if $game_switches[124] == true
+  	  @sprite_bg.bitmap = RPG::Cache.picture('lined_paper_red')
+      @sprite_scroll_up.bitmap = RPG::Cache.picture('scroll_up_red')
+      @sprite_scroll_down.bitmap = RPG::Cache.picture('scroll_down_red')
+  	else
       @sprite_bg.bitmap = RPG::Cache.picture('lined_paper_blue') #Bitmap.new(640, 480)
-	end
+      @sprite_scroll_up.bitmap = RPG::Cache.picture('scroll_up_blue')
+      @sprite_scroll_down.bitmap = RPG::Cache.picture('scroll_down_blue')
+  	end
     @sprite_bg.zoom_x = @sprite_bg.zoom_y = 2
     @sprite_bg.x = 120
     @sprite_bg.y = 24
+    @sprite_scroll_up.zoom_x = @sprite_scroll_up.zoom_y = 2
+    @sprite_scroll_up.x = 524
+    @sprite_scroll_up.y = 24
+    @sprite_scroll_down.zoom_x = @sprite_scroll_down.zoom_y = 2
+    @sprite_scroll_down.x = 524
+    @sprite_scroll_down.y = 424
     #@sprite_bg.bitmap.fill_rect(0, 0, 640, 480, Color.new(0, 0, 0, 128))
     @sprite_text = Sprite.new(@viewport)
     @contents = Bitmap.new(200, 216)
@@ -33,6 +45,11 @@ class Doc_Message
 
     @sprite_bg.opacity = 0
     @sprite_text.opacity = 0
+    @sprite_scroll_down.opacity = 0
+    @sprite_scroll_up.opacity = 0
+
+    @y_offset = 0
+    @scroll_limit = 0
 
     # Animation flags
     @fade_in = false
@@ -59,6 +76,7 @@ class Doc_Message
       $game_temp.message_proc = nil
     end
     $game_temp.message_doc_text = nil
+    @y_offset = 0
   end
   #--------------------------------------------------------------------------
   # * Refresh: Load new message text and pre-process it
@@ -68,11 +86,11 @@ class Doc_Message
     text = ''
     y = -1
 
-	if $game_switches[124] == true
-	  @sprite_bg.bitmap = RPG::Cache.picture('lined_paper_red')
-	else
+  	if $game_switches[124] == true
+  	  @sprite_bg.bitmap = RPG::Cache.picture('lined_paper_red')
+  	else
       @sprite_bg.bitmap = RPG::Cache.picture('lined_paper_blue') #Bitmap.new(640, 480)
-	end
+  	end
 
     # Pre-process text
     text_raw = $game_temp.message_doc_text.to_str
@@ -92,7 +110,8 @@ class Doc_Message
     text_raw.gsub!("\\\\", "\\")
 
     # Now split text into lines by measuring text metrics
-    x = y = 0
+    x = 0
+    y = 1
     maxwidth = @contents.width - HORIZ_MARGIN * 2
     spacesize = @contents.text_size(' ')
     for i in text_raw.split(/ /)
@@ -126,6 +145,11 @@ class Doc_Message
       end
     end
 
+    @scroll_limit = 11 - y
+    if @scroll_limit > 0
+      @scroll_limit = 0
+    end
+
     # Prepare renderer
     @contents.clear
     @contents.font.color = Color.new(100, 92, 255, 255)
@@ -133,7 +157,7 @@ class Doc_Message
 	  @contents.font.color = Color.new(255, 92, 100, 255)
 	end
     x = 0
-    y = 0
+    y = 1
 
     # Get 1 text character in c (loop until unable to get text)
     while ((c = text.slice!(/./m)) != nil)
@@ -155,7 +179,7 @@ class Doc_Message
         next
       end
       # Draw text
-      @contents.draw_text(HORIZ_MARGIN + x, VERT_MARGIN + (y + 1) * 18 - spacesize.height, 40, 18, c)
+      @contents.draw_text(HORIZ_MARGIN + x, VERT_MARGIN + (y + @y_offset) * 18 - spacesize.height, 40, 18, c)
       # Add x to drawn text width
       x += @contents.text_size(c).width
     end
@@ -176,7 +200,6 @@ class Doc_Message
         @viewport.visible = false
         $game_temp.message_window_showing = false
       end
-      return
     end
 
     # Handle fade-in effect
@@ -189,6 +212,23 @@ class Doc_Message
         @fade_in = false
         $game_temp.message_window_showing = true
       end
+    end
+
+    # set the scroll indicators to the opacity of the bg,
+    # or 0 if they cannot scroll further
+    if @y_offset < 0
+      @sprite_scroll_up.opacity = @sprite_bg.opacity
+    else
+      @sprite_scroll_up.opacity = 0
+    end
+    if @y_offset > @scroll_limit
+      @sprite_scroll_down.opacity = @sprite_bg.opacity
+    else
+      @sprite_scroll_down.opacity = 0
+    end
+
+    # don't perform control actions while fading msg box
+    if @fade_in || @fade_out
       return
     end
 
@@ -197,6 +237,14 @@ class Doc_Message
         terminate_message
         @fade_out = true
       end
+      if Input.trigger?(Input::UP) && @y_offset < 0
+        @y_offset += 1
+        refresh()
+      end
+      if Input.trigger?(Input::DOWN) && @y_offset > @scroll_limit
+        @y_offset -= 1
+        refresh()
+      end
     end
 
     # Message is over and should be hidden or advanced to next
diff --git a/scripts/Interpreter 3.rb b/scripts/Interpreter 3.rb
index 616d100..b255c64 100644
--- a/scripts/Interpreter 3.rb	
+++ b/scripts/Interpreter 3.rb	
@@ -11,7 +11,11 @@ class Interpreter
   #--------------------------------------------------------------------------
   def command_101
     # If other text has been set to message_text
-    if $game_temp.message_text != nil || $game_temp.message_ed_text != nil || $game_temp.message_doc_text != nil || $game_temp.message_desktop_text != nil || $game_temp.message_credits_text != nil
+    if $game_temp.message_text != nil ||
+      $game_temp.message_ed_text != nil ||
+      $game_temp.message_doc_text != nil ||
+      $game_temp.message_desktop_text != nil ||
+      $game_temp.message_credits_text != nil
       # End
       return false
     end
diff --git a/scripts/RPG.rb b/scripts/RPG.rb
index 0a3bee3..1a18a88 100644
--- a/scripts/RPG.rb
+++ b/scripts/RPG.rb
@@ -42,17 +42,3 @@ class Tone
     self.red == 0 && self.green == 0 && self.blue == 0 && self.gray == 0
   end
 end
-
-module Graphics
-  class << self
-    alias_method :update_native, :update
-    def update
-      #if $game_map.map_id == 97
-      #  Oneshot.allow_exit false
-      #elsif $game_system.map_interpreter
-      # Oneshot.allow_exit ($scene == nil)
-      #end
-      update_native
-    end
-  end
-end
diff --git a/scripts/Script.rb b/scripts/Script.rb
index 88898f5..6f6565f 100644
--- a/scripts/Script.rb
+++ b/scripts/Script.rb
@@ -140,7 +140,7 @@ module Script
 	end
 	return false
   end
-  
+
   def self.countdown_extend_over
     equinox = Time.new(2017, 03, 27)
 	diff = equinox - Time.now
@@ -149,7 +149,7 @@ module Script
 	end
 	return false
   end
-  
+
   def self.cdown_update(equinox)
     diff = equinox - Time.now
 	if(diff < 0)
@@ -217,7 +217,7 @@ module Script
   def self.countdown_update
     return cdown_update(Time.new(2017, 03, 27))
   end
-  
+
   def self.countdown_extend_update
     return cdown_update(Time.new(2017, 03, 27))
   end
@@ -254,7 +254,7 @@ module Script
       end
     end
   end
-  
+
   def self.niko_reflection_enc_update
     for event in $game_map.events.values
       if event.name == "niko reflection"
@@ -268,7 +268,7 @@ module Script
         if event.real_y > 19*128
           event.real_y = 19*128
         end
-		
+
         if event.x > 14
           event.x = 14
         elsif event.x < 6
@@ -279,7 +279,7 @@ module Script
         elsif event.real_x < (6*128) + 32
           event.real_x = (6*128) + 32
         end
-		
+
         event.direction = $game_player.direction
         event.pattern = $game_player.pattern
         case event.direction
@@ -292,8 +292,8 @@ module Script
       end
     end
   end
-  
-  
+
+
   def self.niko_reflection_peng_update
     for event in $game_map.events.values
       if event.name == "niko reflection"
@@ -307,7 +307,7 @@ module Script
         if event.real_y > 19*128
           event.real_y = 19*128
         end
-		
+
         if event.x > 14
           event.x = 14
         elsif event.x < 6
@@ -318,7 +318,7 @@ module Script
         elsif event.real_x < (6*128) + 32
           event.real_x = (6*128) + 32
         end
-		
+
         return
       end
     end
@@ -373,11 +373,11 @@ module Script
   end
 
   def self.copy_journal
-    Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games")
-    Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot")
+    Dir.mkdir(Oneshot::DOCS_PATH + "/My Games") unless File.exists?(Oneshot::DOCS_PATH + "/My Games")
+    Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot")
 	begin
       File.open("_______.exe", "rb") do |input|
-        File.open(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\_______.exe","wb") do |output|
+        File.open(Oneshot::DOCS_PATH + "/My Games/Oneshot/_______.exe","wb") do |output|
           while buff = input.read(4096)
             output.write(buff)
           end
@@ -388,7 +388,7 @@ module Script
 	end
 	if File.exists?("README.txt")
       File.open("README.txt", "rb") do |input|
-        File.open(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\README.txt","wb") do |output|
+        File.open(Oneshot::DOCS_PATH + "/My Games/Oneshot/README.txt","wb") do |output|
           while buff = input.read(4096)
             output.write(buff)
           end
@@ -396,43 +396,43 @@ module Script
       end
 	end
   end
-  
+
   def self.create_boxes
-    Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games")
-    Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot")
-    Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal1") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal1")
-    Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal2") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal2")
-    Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal3") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal3")
-    Dir.mkdir(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal") unless File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal")
+    Dir.mkdir(Oneshot::DOCS_PATH + "/My Games") unless File.exists?(Oneshot::DOCS_PATH + "/My Games")
+    Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot")
+    Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal1") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal1")
+    Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal2") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal2")
+    Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal3") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal3")
+    Dir.mkdir(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal") unless File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal")
   end
-  
+
   def self.delete_if_exists(f_name)
     File.delete(f_name) unless !File.exists?(f_name)
   end
-  
+
   def self.clear_boxes
     for i in 1..3
-	  portal_path = Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal" + i.to_s
+	  portal_path = Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal" + i.to_s
 	  case i
 	  when 1
-	    delete_if_exists(portal_path + "\\blue_npc_prototype.png")
-	    delete_if_exists(portal_path + "\\proto1.png")
-	    delete_if_exists(portal_path + "\\keyB.txt")
+	    delete_if_exists(portal_path + "/blue_npc_prototype.png")
+	    delete_if_exists(portal_path + "/proto1.png")
+	    delete_if_exists(portal_path + "/keyB.txt")
 	  when 2
-	    delete_if_exists(portal_path + "\\green_npc_cedric.png")
-	    delete_if_exists(portal_path + "\\cedric.png")
-	    delete_if_exists(portal_path + "\\keyG.txt")
+	    delete_if_exists(portal_path + "/green_npc_cedric.png")
+	    delete_if_exists(portal_path + "/cedric.png")
+	    delete_if_exists(portal_path + "/keyG.txt")
 	  when 3
-	    delete_if_exists(portal_path + "\\red_rue.png")
-	    delete_if_exists(portal_path + "\\rue.png")
-	    delete_if_exists(portal_path + "\\keyR.txt")
+	    delete_if_exists(portal_path + "/red_rue.png")
+	    delete_if_exists(portal_path + "/rue.png")
+	    delete_if_exists(portal_path + "/keyR.txt")
 	  end
 	end
-	delete_if_exists(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal\\keyB.txt")
-	delete_if_exists(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal\\keyG.txt")
-	delete_if_exists(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal\\keyR.txt")
+	delete_if_exists(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal/keyB.txt")
+	delete_if_exists(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal/keyG.txt")
+	delete_if_exists(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal/keyR.txt")
   end
-  
+
   def self.copy_file(src, dst)
     begin
       File.open(src, "rb") do |input|
@@ -446,89 +446,89 @@ module Script
 	  #this probably means the file already exists and is open, so no need to create it again
 	end
   end
-  
+
   def self.write_key(dst, str)
     File.open(dst, 'w') do |file|
       file.puts(str)
     end
   end
-  
+
   def self.put_key_in_box(numb)
-    portal_path = Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal" + numb.to_s
+    portal_path = Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal" + numb.to_s
 	case numb
 	when 1
-	  copy_file("Graphics\\Characters\\blue_npc_prototype.png", portal_path + "\\blue_npc_prototype.png")
-	  copy_file("Graphics\\Faces\\proto1.png", portal_path + "\\proto1.png")
-	  write_key(portal_path + "\\keyB.txt", PROTO_TEXT)
+	  copy_file("Graphics/Characters/blue_npc_prototype.png", portal_path + "/blue_npc_prototype.png")
+	  copy_file("Graphics/Faces/proto1.png", portal_path + "/proto1.png")
+	  write_key(portal_path + "/keyB.txt", PROTO_TEXT)
 	when 2
-	  copy_file("Graphics\\Characters\\green_npc_cedric.png", portal_path + "\\green_npc_cedric.png")
-	  copy_file("Graphics\\Faces\\cedric.png", portal_path + "\\cedric.png")
-	  write_key(portal_path + "\\keyG.txt", CEDRIC_TEXT)
+	  copy_file("Graphics/Characters/green_npc_cedric.png", portal_path + "/green_npc_cedric.png")
+	  copy_file("Graphics/Faces/cedric.png", portal_path + "/cedric.png")
+	  write_key(portal_path + "/keyG.txt", CEDRIC_TEXT)
 	when 3
-	  copy_file("Graphics\\Characters\\red_rue.png", portal_path + "\\red_rue.png")
-	  copy_file("Graphics\\Faces\\rue.png", portal_path + "\\rue.png")
-	  write_key(portal_path + "\\keyR.txt", RUE_TEXT)
+	  copy_file("Graphics/Characters/red_rue.png", portal_path + "/red_rue.png")
+	  copy_file("Graphics/Faces/rue.png", portal_path + "/rue.png")
+	  write_key(portal_path + "/keyR.txt", RUE_TEXT)
 	end
-	  
+
   end
-  
+
   def self.password1
     locale = $persistent.langcode
 	if !Language::LANGUAGES.include? locale
 	  locale = 'en'
 	end
-    source_dir = "Graphics\\Fogs\\_\\scenario1\\" + locale.downcase
-    copy_file(source_dir + "\\pw1.png", Oneshot::DOCS_PATH + "\\ONESHOT_password1.png")
-    copy_file(source_dir + "\\pw2.png", Oneshot::DOCS_PATH + "\\ONESHOT_password2.png")
-    copy_file(source_dir + "\\pw3.png", Oneshot::DOCS_PATH + "\\ONESHOT_password3.png")
-    copy_file(source_dir + "\\pw4.png", Oneshot::DOCS_PATH + "\\ONESHOT_password4.png")
+    source_dir = "Graphics/Fogs/_/scenario1/" + locale.downcase
+    copy_file(source_dir + "/pw1.png", Oneshot::DOCS_PATH + "/ONESHOT_password1.png")
+    copy_file(source_dir + "/pw2.png", Oneshot::DOCS_PATH + "/ONESHOT_password2.png")
+    copy_file(source_dir + "/pw3.png", Oneshot::DOCS_PATH + "/ONESHOT_password3.png")
+    copy_file(source_dir + "/pw4.png", Oneshot::DOCS_PATH + "/ONESHOT_password4.png")
   end
-  
+
   def self.password2
     locale = $persistent.langcode
 	if !Language::LANGUAGES.include? locale
 	  locale = 'en'
 	end
-    source_dir = "Graphics\\Fogs\\_\\scenario2\\" + locale.downcase
-    copy_file(source_dir + "\\pw1.png", Oneshot::DOCS_PATH + "\\ONESHOT_password1.png")
-    copy_file(source_dir + "\\pw2.png", Oneshot::DOCS_PATH + "\\ONESHOT_password2.png")
-    copy_file(source_dir + "\\pw3.png", Oneshot::DOCS_PATH + "\\ONESHOT_password3.png")
-    copy_file(source_dir + "\\pw4.png", Oneshot::DOCS_PATH + "\\ONESHOT_password4.png")
+    source_dir = "Graphics/Fogs/_/scenario2/" + locale.downcase
+    copy_file(source_dir + "/pw1.png", Oneshot::DOCS_PATH + "/ONESHOT_password1.png")
+    copy_file(source_dir + "/pw2.png", Oneshot::DOCS_PATH + "/ONESHOT_password2.png")
+    copy_file(source_dir + "/pw3.png", Oneshot::DOCS_PATH + "/ONESHOT_password3.png")
+    copy_file(source_dir + "/pw4.png", Oneshot::DOCS_PATH + "/ONESHOT_password4.png")
   end
-  
+
 =begin
   def self.take_key_out_of_box(numb)
-	if File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Box" + numb.to_s + "\\key" + numb.to_s + ".png")
-      File.delete(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Box" + numb.to_s + "\\key" + numb.to_s + ".png")
+	if File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/Box" + numb.to_s + "/key" + numb.to_s + ".png")
+      File.delete(Oneshot::DOCS_PATH + "/My Games/Oneshot/Box" + numb.to_s + "/key" + numb.to_s + ".png")
 	end
-	if File.exists?(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigBox\\key" + numb.to_s + ".png")
-      File.delete(Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigBox\\key" + numb.to_s + ".png")
+	if File.exists?(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigBox/key" + numb.to_s + ".png")
+      File.delete(Oneshot::DOCS_PATH + "/My Games/Oneshot/BigBox/key" + numb.to_s + ".png")
 	end
   end
 =end
-  
+
   def self.is_key_in_box(numb)
-    portal_path = Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\Portal" + numb.to_s
+    portal_path = Oneshot::DOCS_PATH + "/My Games/Oneshot/Portal" + numb.to_s
 	case numb
 	when 1
-	  return File.exists?(portal_path + "\\keyB.txt")
+	  return File.exists?(portal_path + "/keyB.txt")
 	when 2
-	  return File.exists?(portal_path + "\\keyG.txt")
+	  return File.exists?(portal_path + "/keyG.txt")
 	when 3
-	  return File.exists?(portal_path + "\\keyR.txt")
+	  return File.exists?(portal_path + "/keyR.txt")
 	end
     return false
   end
-  
+
   def self.is_key_in_bigbox(numb)
-    portal_path = Oneshot::DOCS_PATH + "\\My Games\\Oneshot\\BigPortal"
+    portal_path = Oneshot::DOCS_PATH + "/My Games/Oneshot/BigPortal"
 	case numb
 	when 1
-	  return File.exists?(portal_path + "\\keyB.txt")
+	  return File.exists?(portal_path + "/keyB.txt")
 	when 2
-	  return File.exists?(portal_path + "\\keyG.txt")
+	  return File.exists?(portal_path + "/keyG.txt")
 	when 3
-	  return File.exists?(portal_path + "\\keyR.txt")
+	  return File.exists?(portal_path + "/keyR.txt")
 	end
     return false
   end
@@ -569,10 +569,10 @@ def check_exit(min, max, x: -1, y: -1)
 end
 
 def loadQASave(fname)
-  filename = "testing_saves/" + fname + ".rxdata" 
+  filename = "testing_saves/" + fname + ".rxdata"
     # If file doesn't exist
     unless FileTest.exist?(filename)
-      filename = "testing_saves_postgame/" + fname + ".rxdata" 
+      filename = "testing_saves_postgame/" + fname + ".rxdata"
 	  unless FileTest.exist?(filename)
         # Play buzzer SE
         $game_system.se_play($data_system.buzzer_se)
@@ -581,7 +581,7 @@ def loadQASave(fname)
     end
     # Play load SE
     $game_system.se_play($data_system.load_se)
-    
+
 	# Read save data
     file = File.open(filename, "rb")
     # Read character data for drawing save file
diff --git a/scripts/Sprite_MapText.rb b/scripts/Sprite_MapText.rb
index e60c550..ad3b713 100644
--- a/scripts/Sprite_MapText.rb
+++ b/scripts/Sprite_MapText.rb
@@ -7,9 +7,14 @@ class Sprite_MapText < Sprite
     @real_x = x * 4 * 32
     @real_y = y * 4 * 32
 
-    self.zoom_x = 2
-    self.zoom_y = 2
     self.bitmap = Bitmap.new(200, 24)
+    if (Language::FONT_WESTERN == Font.default_name)
+      self.zoom_x = 2
+      self.zoom_y = 2
+    else
+      self.zoom_x = 1.5
+      self.zoom_y = 1.5
+    end
 
 	#calculate text width
     spacewidth = self.bitmap.text_size(' ').width
diff --git a/scripts/i18n_Language.rb b/scripts/i18n_Language.rb
index 2bc51bf..881341c 100644
--- a/scripts/i18n_Language.rb
+++ b/scripts/i18n_Language.rb
@@ -13,7 +13,7 @@ class Language
     'en', 'fr', 'pt_BR', 'es'
   ]
   LANG_J = [
-	'ja'
+    'ja'
   ]
   LANG_CK = [
      'ko', 'zh_CN'
@@ -34,13 +34,13 @@ class Language
             @data = Marshal.load(file)
             if LANG_CK.include? name
                 Font.default_name = FONT_CK
-			elsif LANG_J.include? name
-				Font.default_name = FONT_J
+            elsif LANG_J.include? name
+                Font.default_name = FONT_J
             else
                 Font.default_name = FONT_WESTERN
             end
             Journal.setLang(name)
-			dbg_print(Font.default_name)
+            dbg_print(Font.default_name)
           end
         end
       end
@@ -51,14 +51,13 @@ class Language
     # Translate some text
     def tr(string)
       #dbg_print(caller_locations(1, 1).first.tap{|loc| puts "#{loc.path}:#{loc.lineno}"})
-      dbg_print(string)
       if @data
         rv = @data[Zlib::crc32(string)] || string
       else
         rv = string
       end
-      dbg_print(rv)
-      return rv
+      dbg_print(string + " -> " + rv)
+      return String.new(rv)
     end
 
     # Turn all database items into translatable strings