diff --git a/src/gateware/cxp_frame_pipeline.py b/src/gateware/cxp_frame_pipeline.py
index f8f7680..e2257dc 100644
--- a/src/gateware/cxp_frame_pipeline.py
+++ b/src/gateware/cxp_frame_pipeline.py
@@ -57,10 +57,10 @@ class End_Of_Line_Inserter(Module):
         ]
 
 class Stream_Arbiter(Module):
-    def __init__(self, n_downconn):
-        self.n_ext_active = Signal(max=n_downconn) 
+    def __init__(self, n_channels):
+        self.n_ext_active = Signal(max=n_channels) 
 
-        self.sinks = [stream.Endpoint(word_layout_dchar) for _ in range(n_downconn)]
+        self.sinks = [stream.Endpoint(word_layout_dchar) for _ in range(n_channels)]
         self.source = stream.Endpoint(word_layout_dchar)
         # # #
 
@@ -633,8 +633,8 @@ class ROI(Module):
         ])
 
         # # #
-        #
 
+        # TODO: remove the self. from self.roi_4x
         self.roi_4x = []
         for _ in range(4):
             self.roi_4x.append(Record([