diff --git a/minetest.conf b/minetest.conf
index 9b9953d..59cf10b 100644
--- a/minetest.conf
+++ b/minetest.conf
@@ -4,23 +4,32 @@ fixed_map_seed = 14703851313754985906
 map_generation_limit = 160
 vote.kick_vote = false
 
+#
+# CTF_PVP_ENGINE
 # See mods/ctf_pvp_engine/minetest.conf.example for ctf_pvp_engine settings.
+#
+
 ctf.colors.skins = true
 ctf.colors.nametag = true
+
 ctf.flag.capture_take = true
+ctf.flag.waypoints
+
 ctf.allocate_mode = 3
 ctf.diplomacy = false
 ctf.players_can_change_team = false
 ctf.node_ownership = false
 ctf.friendly_fire = false
+ctf.remove_player_on_leave = true
+ctf.autoalloc_on_joinplayer = true
+
 ctf.match = true
 ctf.match.teams = red, red, 15, 7, 39; blue, blue, -9, 9, -43
 ctf.match.clear_inv = true
 ctf.match.destroy_team = true
 ctf.match.reset_on_winner = true
 ctf.match.map_reset_limit = 160
-ctf.remove_player_on_leave = true
-ctf.autoalloc_on_joinplayer = true
+
 ctf.gui.tab.flags = false
 ctf.gui.tab.settings = false
 ctf.gui.tab.diplo = false
diff --git a/mods/ctf_pvp_engine b/mods/ctf_pvp_engine
index b8b6ff7..60e4e06 160000
--- a/mods/ctf_pvp_engine
+++ b/mods/ctf_pvp_engine
@@ -1 +1 @@
-Subproject commit b8b6ff76e771bc1fb95fe19a68800147902d76b2
+Subproject commit 60e4e0600e276da330ab2d5085ddb232df559150