diff --git a/selfdrive/test/process_replay/model_replay.py b/selfdrive/test/process_replay/model_replay.py
index 0e43cad820..74cf168755 100755
--- a/selfdrive/test/process_replay/model_replay.py
+++ b/selfdrive/test/process_replay/model_replay.py
@@ -22,6 +22,7 @@ SEND_EXTRA_INPUTS = bool(int(os.getenv("SEND_EXTRA_INPUTS", "0")))
 
 
 def get_log_fn(ref_commit, test_route):
+  # TODO: regenerate with zst
   return f"{test_route}_model_tici_{ref_commit}.bz2"
 
 
diff --git a/selfdrive/test/process_replay/test_regen.py b/selfdrive/test/process_replay/test_regen.py
index 17fefcb497..52a531422f 100644
--- a/selfdrive/test/process_replay/test_regen.py
+++ b/selfdrive/test/process_replay/test_regen.py
@@ -15,6 +15,7 @@ TESTED_SEGMENTS = [
 
 
 def ci_setup_data_readers(route, sidx):
+  # TODO: use openpilotci source!
   lr = LogReader(get_url(route, sidx, "rlog"))
   frs = {
     'roadCameraState': FrameReader(get_url(route, sidx, "fcamera")),
diff --git a/tools/lib/azure_container.py b/tools/lib/azure_container.py
index a5d650e98f..79b8d1c021 100644
--- a/tools/lib/azure_container.py
+++ b/tools/lib/azure_container.py
@@ -54,6 +54,7 @@ class AzureContainer:
     return client, key
 
   def get_url(self, route_name: str, segment_num, log_type="rlog") -> str:
+    # TODO: this is too rigid
     ext = "hevc" if log_type.endswith('camera') else "bz2"
     return self.BASE_URL + f"{route_name.replace('|', '/')}/{segment_num}/{log_type}.{ext}"
 
diff --git a/tools/lib/comma_car_segments.py b/tools/lib/comma_car_segments.py
index 78825504e6..86745d09d7 100644
--- a/tools/lib/comma_car_segments.py
+++ b/tools/lib/comma_car_segments.py
@@ -87,4 +87,5 @@ def get_repo_url(path):
 
 
 def get_url(route, segment, file="rlog.bz2"):
+  # TODO: future segments can be .zst
   return get_repo_url(f"segments/{route.replace('|', '/')}/{segment}/{file}")
diff --git a/tools/lib/logreader.py b/tools/lib/logreader.py
index 07a4b2003e..b91a0e3d7b 100755
--- a/tools/lib/logreader.py
+++ b/tools/lib/logreader.py
@@ -152,6 +152,7 @@ def internal_source_zst(sr: SegmentRange, mode: ReadMode, file_ext: str = "zst")
 
 
 def openpilotci_source(sr: SegmentRange, mode: ReadMode) -> LogPaths:
+  # TODO: fixup these sources to support any log file extension
   rlog_paths = [get_url(sr.route_name, seg, "rlog") for seg in sr.seg_idxs]
   qlog_paths = [get_url(sr.route_name, seg, "qlog") for seg in sr.seg_idxs]