diff --git a/TUTORIAL.txt b/TUTORIAL.txt
index ceffea7..eed56d5 100644
--- a/TUTORIAL.txt
+++ b/TUTORIAL.txt
@@ -73,9 +73,7 @@ starts, this will set the position to the node you're looking at (not over it).
 To modify a map you must use use /skywars reset <arena name> and then disable 
 the arena, otherwise your changes may get lost.
 Everything you change when the arena's disabled won't be saved, so make
-sure to properly reset your map before doing so (e.g. if when you reset the arena
-flowing lava and water created some stone it won't be reset the first time, so
-you'll have to reset it until the map is clear).
+sure to properly reset your map before doing so.
 
 
 
diff --git a/_arena_lib/arena_callbacks.lua b/_arena_lib/arena_callbacks.lua
index 16d72a2..c064754 100644
--- a/_arena_lib/arena_callbacks.lua
+++ b/_arena_lib/arena_callbacks.lua
@@ -94,7 +94,7 @@ arena_lib.on_death("skywars", function(arena, pl_name, reason)
       local killer = reason.object:get_player_name()
       local killer_health = reason.object:get_hp()
 
-      arena_lib.send_message_players_in_arena(arena, skywars_settings.prefix .. skywars.T("@1 was killed by @2", pl_name, killer))
+      arena_lib.send_message_in_arena(arena, "players", skywars_settings.prefix .. skywars.T("@1 was killed by @2", pl_name, killer))
       skywars.print_msg(pl_name, skywars.T("@1 killed you with @2 HPs", killer, killer_health))
       skywars.increment_players_killed(killer)
     end
@@ -203,7 +203,7 @@ end)
 
 arena_lib.on_timeout("skywars", function(arena)
   arena_lib.load_celebration("skywars", arena, skywars.T("Nobody"))
-  arena_lib.send_message_players_in_arena(arena, skywars_settings.prefix .. skywars.T("Time is out, the match is over!"))
+  arena_lib.send_message_in_arena(arena, "players", skywars_settings.prefix .. skywars.T("Time is out, the match is over!"))
 end)
 
 
diff --git a/_chest_handler/chest_setter.lua b/_map_handler/chests/chest_setter.lua
similarity index 100%
rename from _chest_handler/chest_setter.lua
rename to _map_handler/chests/chest_setter.lua
diff --git a/_chest_handler/treasures.lua b/_map_handler/chests/treasures.lua
similarity index 97%
rename from _chest_handler/treasures.lua
rename to _map_handler/chests/treasures.lua
index adbd299..2aca62c 100644
--- a/_chest_handler/treasures.lua
+++ b/_map_handler/chests/treasures.lua
@@ -1,4 +1,3 @@
--- Select the treasures to put in the chests inventory
 local mod = "skywars"
 local random = math.random
 local ceil = math.ceil
diff --git a/init.lua b/init.lua
index ddb28c9..454005d 100644
--- a/init.lua
+++ b/init.lua
@@ -25,7 +25,7 @@ arena_lib.register_minigame("skywars", {
     kits = {},
     is_resetting = false
   },
-  time_mode = 2,
+  time_mode = "decremental",
   disabled_damage_types = disabled_damage_types_
 })
 
@@ -37,14 +37,14 @@ dofile(minetest.get_modpath("skywars") .. "/utils.lua")
 dofile(minetest.get_modpath("skywars") .. "/_map_handler/map_utils.lua")
 dofile(minetest.get_modpath("skywars") .. "/_map_handler/map_reset.lua")
 dofile(minetest.get_modpath("skywars") .. "/_map_handler/map_saving.lua")
+dofile(minetest.get_modpath("skywars") .. "/_map_handler/chests/chest_setter.lua")
+dofile(minetest.get_modpath("skywars") .. "/_map_handler/chests/treasures.lua")
 dofile(minetest.get_modpath("skywars") .. "/_tests/map_reset.lua")
 dofile(minetest.get_modpath("skywars") .. "/_compatible_mods/enderpearl/init_enderpearl.lua")
 dofile(minetest.get_modpath("skywars") .. "/_compatible_mods/3d_armor/init_3d_armor.lua")
 dofile(minetest.get_modpath("skywars") .. "/_storage/storage_manager.lua")
 dofile(minetest.get_modpath("skywars") .. "/_hud/hud_manager.lua")
 dofile(minetest.get_modpath("skywars") .. "/commands.lua")
-dofile(minetest.get_modpath("skywars") .. "/_chest_handler/chest_setter.lua")
-dofile(minetest.get_modpath("skywars") .. "/_chest_handler/treasures.lua")
 dofile(minetest.get_modpath("skywars") .. "/_arena_lib/arena_callbacks.lua")
 dofile(minetest.get_modpath("skywars") .. "/_kits/formspec.lua")
 dofile(minetest.get_modpath("skywars") .. "/_kits/kit_items.lua")