diff --git a/Autoload/Columnset.gd b/Autoload/Columnset.gd
index 10701bef..24f5491a 100644
--- a/Autoload/Columnset.gd
+++ b/Autoload/Columnset.gd
@@ -94,7 +94,7 @@ func export_toml_columnset(filePath, fullExport): #"res://columnset.toml"
 	if fullExport == false:
 		column_diffs = find_all_different_columns()
 		if column_diffs.size() == 0:
-			oMessage.big("File wasn't saved", "You've made zero changes, so the file wasn't saved. Did you mean to enable 'Full'?")
+			oMessage.big("File wasn't saved", "You've made zero changes, so the file wasn't saved.")
 			return
 	
 	var textFile = File.new()
diff --git a/Autoload/Settings.gd b/Autoload/Settings.gd
index 102eacbf..eeb6bc36 100644
--- a/Autoload/Settings.gd
+++ b/Autoload/Settings.gd
@@ -177,8 +177,9 @@ func game_setting(doWhat,string,value):
 			if doWhat == SET: OS.vsync_enabled = value
 			if doWhat == GET: return OS.vsync_enabled
 		"framerate_limit":
-			if doWhat == SET: Engine.target_fps = value
-			if doWhat == GET: return Engine.target_fps
+			var oEditor = $'../Main/Editor'
+			if doWhat == SET: oEditor.framerate_limit = value
+			if doWhat == GET: return oEditor.framerate_limit
 		"always_decompress":
 			var oOpenMap = $'../Main/OpenMap'
 			if doWhat == SET: oOpenMap.ALWAYS_DECOMPRESS = value
diff --git a/Autoload/Slabset.gd b/Autoload/Slabset.gd
index d79967ee..b211a002 100644
--- a/Autoload/Slabset.gd
+++ b/Autoload/Slabset.gd
@@ -241,7 +241,7 @@ func export_toml_slabset(filePath, fullExport): #"res://slabset.toml"
 		dat_diffs = find_all_dat_differences()
 		tng_diffs = find_all_tng_differences()
 		if tng_diffs.size() == 0 and dat_diffs.size() == 0:
-			oMessage.big("File wasn't saved", "You've made zero changes, so the file wasn't saved. Did you mean to enable 'Full'?")
+			oMessage.big("File wasn't saved", "You've made zero changes, so the file wasn't saved.")
 			return
 	
 	# Print differences for debugging
diff --git a/Autoload/Things.gd b/Autoload/Things.gd
index c76e0398..697e1d4c 100644
--- a/Autoload/Things.gd
+++ b/Autoload/Things.gd
@@ -99,7 +99,7 @@ func fetch_id_string(thing_type, sub_type):
 			return nameId[0].capitalize()
 		return "Error1337"
 	else:
-		return "Unknown " + data_structure_name[thing_type] + ": " + str(sub_type)
+		return "Unknown " + data_structure_name.get(thing_type, "Unknown") + ": " + str(sub_type)
 
 
 var data_structure_name = {
diff --git a/Scenes/Editor.gd b/Scenes/Editor.gd
index b51b302e..8834af5d 100644
--- a/Scenes/Editor.gd
+++ b/Scenes/Editor.gd
@@ -25,6 +25,7 @@ enum {
 var currentView = VIEW_2D
 var fieldBoundary = Rect2()
 var mapHasBeenEdited = false setget set_map_has_been_edited
+var framerate_limit = 120 setget set_framerate_limit
 
 func set_map_has_been_edited(setVal):
 	if int(setVal) == oEditor.SET_EDITED_WITHOUT_SAVING_STATE: #If you save, then click Undo, it should mark as not saved but not create a new undo state when marking as edited.
@@ -71,10 +72,10 @@ func _notification(what):
 			Utils.popup_centered(oConfirmSaveBeforeQuit)
 		else:
 			get_tree().quit()
-#	elif what == MainLoop.NOTIFICATION_WM_FOCUS_IN:
-#		Engine.target_fps = 0
-#	elif what == MainLoop.NOTIFICATION_WM_FOCUS_OUT:
-#		Engine.target_fps = 12
+	elif what == MainLoop.NOTIFICATION_WM_FOCUS_IN:
+		Engine.target_fps = framerate_limit
+	elif what == MainLoop.NOTIFICATION_WM_FOCUS_OUT:
+		Engine.target_fps = min(12, framerate_limit)
 
 func just_opened_editor():
 	yield(get_tree(),'idle_frame')
@@ -103,3 +104,7 @@ func update_boundaries():
 	fieldBoundary = Rect2(Vector2(1,1), Vector2(M.xSize-2,M.ySize-2)) # Position, Size
 	if oEditableBordersCheckbox.pressed == true:
 		fieldBoundary = Rect2(Vector2(0,0), Vector2(M.xSize,M.ySize))
+
+func set_framerate_limit(val):
+	Engine.target_fps = val
+	framerate_limit = val