diff --git a/cybersyn/scripts/global.lua b/cybersyn/scripts/global.lua
index d6a2ae9..961980c 100644
--- a/cybersyn/scripts/global.lua
+++ b/cybersyn/scripts/global.lua
@@ -72,22 +72,23 @@
 ---@type CybersynModSettings
 mod_settings = {}
 
---TODO: guarantee this only inits once
-global.total_ticks = 0
-global.tick_state = STATE_INIT
-global.tick_data = {}
-global.economy = {
-	all_r_stations = {},
-	all_p_stations = {},
-	all_names = {},
-}
-global.to_comb = {}
-global.to_output = {}
-global.to_stop = {}
-global.stations = {}
-global.depots = {}
-global.trains = {}
-global.trains_available = {}
-global.layouts = {}
-global.layout_train_count = {}
-global.layout_top_id = 1
+function init_global()
+	global.total_ticks = 0
+	global.tick_state = STATE_INIT
+	global.tick_data = {}
+	global.economy = {
+		all_r_stations = {},
+		all_p_stations = {},
+		all_names = {},
+	}
+	global.to_comb = {}
+	global.to_output = {}
+	global.to_stop = {}
+	global.stations = {}
+	global.depots = {}
+	global.trains = {}
+	global.trains_available = {}
+	global.layouts = {}
+	global.layout_train_count = {}
+	global.layout_top_id = 1
+end
diff --git a/cybersyn/scripts/main.lua b/cybersyn/scripts/main.lua
index 3d48b97..df6d9c9 100644
--- a/cybersyn/scripts/main.lua
+++ b/cybersyn/scripts/main.lua
@@ -703,6 +703,20 @@ local function on_paste(event)
 	end
 end
 
+local function on_settings_changed(event)
+	mod_settings.tps = settings.global["cybersyn-ticks-per-second"].value --[[@as int]]
+	mod_settings.r_threshold = settings.global["cybersyn-request-threshold"].value--[[@as int]]
+	mod_settings.p_threshold = settings.global["cybersyn-provide-threshold"].value--[[@as int]]
+	mod_settings.network_flag = settings.global["cybersyn-network-flag"].value--[[@as int]]
+	if event.setting == "cybersyn-ticks-per-second" then
+		local nth_tick = math.ceil(60/mod_settings.tps);
+		flib_event.on_nth_tick(nil)
+		flib_event.on_nth_tick(nth_tick, function()
+			tick(global, mod_settings)
+		end)
+	end
+end
+
 
 local filter_built = {
 	{filter = "type", type = "train-stop"},
@@ -722,8 +736,7 @@ local filter_broken = {
 local filter_comb = {
 	{filter = "type", type = "arithmetic-combinator"},
 }
-local function register_events()
-
+local function main()
 	mod_settings.tps = settings.global["cybersyn-ticks-per-second"].value --[[@as int]]
 	mod_settings.r_threshold = settings.global["cybersyn-request-threshold"].value--[[@as int]]
 	mod_settings.p_threshold = settings.global["cybersyn-provide-threshold"].value--[[@as int]]
@@ -753,21 +766,12 @@ local function register_events()
 
 	flib_event.register(defines.events.on_entity_renamed, on_rename)
 
+	flib_event.register(defines.events.on_runtime_mod_setting_changed, on_settings_changed)
+
 	register_gui_actions()
+
+	flib_event.on_init(init_global)
 end
 
-flib_event.on_load(function()
-	register_events()
-end)
 
-flib_event.on_init(function()
-	--TODO: we are not checking changed cargo capacities
-	--find_and_add_all_stations(global)
-	register_events()
-end)
-
-flib_event.on_configuration_changed(function(data)
-	--TODO: we are not checking changed cargo capacities
-	--find_and_add_all_stations(global)
-	register_events()
-end)
+main()
diff --git a/cybersyn/settings.lua b/cybersyn/settings.lua
index dadd6e2..b31e060 100644
--- a/cybersyn/settings.lua
+++ b/cybersyn/settings.lua
@@ -33,7 +33,7 @@ data:extend({
 		order = "ad",
 		setting_type = "runtime-global",
 		default_value = 1,
-		minimum_value = -1,
+		minimum_value = -2147483648,
 		maximum_value = 2147483647,
 	},
 })