diff --git a/Lua/addrs/M/common.lua b/Lua/addrs/M/common.lua
index 9b029c3..8283034 100755
--- a/Lua/addrs/M/common.lua
+++ b/Lua/addrs/M/common.lua
@@ -99,7 +99,7 @@ function Actor(addr)
 end
 
 return {
-    link                = AL(0x00, 0x4000),
+    link                = AL(0x00, 0x3CA0),
     exit_value          = AL(0x02, 2),
     mask_worn           = AL(0x04, 1),
     intro_completed     = AL(0x05, 1),
diff --git a/Lua/race.lua b/Lua/race.lua
index c9b6816..062cf0d 100644
--- a/Lua/race.lua
+++ b/Lua/race.lua
@@ -16,9 +16,8 @@ end
 require "flag manager"
 
 -- TODO: just force a song of time cutscene to reset most things
--- TODO: wipe flags
 
-for i=a.link.addr, a.link.addr + a.link.type, 4 do
+for i=a.link.addr, a.link.addr + a.link.type - 1, 4 do
     W4(i, 0)
 end