diff --git a/applications/disturb2/libraries/disturb/src/vhdl/disturb_pkg.vhd b/applications/disturb2/libraries/disturb/src/vhdl/disturb_pkg.vhd
index d9a2456e73639ff491f4f01134575cef5f1deaa8..e8764f458cc2e131c1b1313830b9c6d457083138 100644
--- a/applications/disturb2/libraries/disturb/src/vhdl/disturb_pkg.vhd
+++ b/applications/disturb2/libraries/disturb/src/vhdl/disturb_pkg.vhd
@@ -95,7 +95,7 @@ PACKAGE disturb_pkg is
   CONSTANT c_disturb_W_crosslet                : NATURAL := 16;
   CONSTANT c_disturb_W_beamlet_sum             : NATURAL := 18;
   CONSTANT c_disturb_W_beamlet                 : NATURAL := 8;
-  CONSTANT c_disturb_W_gn_id                   : NATURAL := 5;
+  CONSTANT c_disturb_W_gn_id                   : NATURAL := 5;  -- Use gn_id = ID MOD 32, so map ID to 0:31 range (2**5 = 32)
   CONSTANT c_disturb_W_statistic               : NATURAL := 64;
   CONSTANT c_disturb_W_statistic_sz            : NATURAL := 2;   -- = c_disturb_W_statistic / c_word_w
   CONSTANT c_disturb_W_sub_weight              : NATURAL := 16;  -- = w in s(w, p), s = signed
@@ -183,8 +183,9 @@ PACKAGE disturb_pkg is
   --   https://git.astron.nl/desp/hdl/-/blob/master/boards/uniboard2b/libraries/unb2b_board/src/vhdl/ctrl_unb2b_board.vhd
 
   -- Can use same offload time for all statistics, because 1GbE mux will combine them
+  -- see https://support.astron.nl/confluence/display/L2M/L3+SDP+Testing+Notebook%3A+Statistics+offload
   --CONSTANT c_disturb_offload_time : NATURAL := 13000;  -- from wave window 62855nS / 5nS = 12571 cycles.
-  CONSTANT c_disturb_offload_time : NATURAL := 600000;  -- see L2SDP-452
+  CONSTANT c_disturb_offload_time : NATURAL := 600000;  -- 600000 * 5 ns = 3 ms, so gn 31 starts after 93 ms
 
   -- packet lengths, see ICD SC-SDP
   CONSTANT c_disturb_nof_bytes_per_statistic : NATURAL := 8;  -- c_disturb_W_statistic_sz * c_word_sz = 2 * 4 = 8
diff --git a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
index 1f392030b12ec07086cbf4db03e3f304d44545a5..8435ef4163ca221cb5376635be90f1760e96bfe9 100644
--- a/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
+++ b/applications/lofar2/libraries/sdp/src/vhdl/sdp_pkg.vhd
@@ -94,7 +94,7 @@ PACKAGE sdp_pkg is
   CONSTANT c_sdp_W_crosslet                : NATURAL := 16;
   CONSTANT c_sdp_W_beamlet_sum             : NATURAL := 18;
   CONSTANT c_sdp_W_beamlet                 : NATURAL := 8;
-  CONSTANT c_sdp_W_gn_id                   : NATURAL := 5;
+  CONSTANT c_sdp_W_gn_id                   : NATURAL := 5;  -- Use gn_id = ID MOD 32, so map ID to 0:31 range (2**5 = 32)
   CONSTANT c_sdp_W_statistic               : NATURAL := 64;
   CONSTANT c_sdp_W_statistic_sz            : NATURAL := 2;   -- = c_sdp_W_statistic / c_word_w
   CONSTANT c_sdp_W_sub_weight              : NATURAL := 16;  -- = w in s(w, p), s = signed
@@ -189,8 +189,9 @@ PACKAGE sdp_pkg is
   --   https://git.astron.nl/desp/hdl/-/blob/master/boards/uniboard2b/libraries/unb2b_board/src/vhdl/ctrl_unb2b_board.vhd
 
   -- Can use same offload time for all statistics, because 1GbE mux will combine them
+  -- see https://support.astron.nl/confluence/display/L2M/L3+SDP+Testing+Notebook%3A+Statistics+offload
   --CONSTANT c_sdp_offload_time : NATURAL := 13000;  -- from wave window 62855nS / 5nS = 12571 cycles.
-  CONSTANT c_sdp_offload_time : NATURAL := 600000;  -- see L2SDP-452
+  CONSTANT c_sdp_offload_time : NATURAL := 600000;  -- 600000 * 5 ns = 3 ms, so gn 31 starts after 93 ms
 
   -- packet lengths, see ICD SC-SDP
   CONSTANT c_sdp_nof_bytes_per_statistic : NATURAL := 8;  -- c_sdp_W_statistic_sz * c_word_sz = 2 * 4 = 8