diff --git a/voltha/core/device_agent.py b/voltha/core/device_agent.py
index 5a57ec9..55feb14 100644
--- a/voltha/core/device_agent.py
+++ b/voltha/core/device_agent.py
@@ -201,7 +201,8 @@
                 device=self.last_data,
                 flows=flows,
                 groups=groups)
-            # TODO place to feed back completion
+            # add ability to notify called when an flow update completes
+            # see https://jira.opencord.org/browse/CORD-839
 
         elif self.accepts_add_remove_flow_updates:
             raise NotImplementedError()
@@ -224,7 +225,8 @@
                 device=self.last_data,
                 flows=flows,
                 groups=groups)
-            # TODO place to feed back completion
+            # add ability to notify called when an group update completes
+            # see https://jira.opencord.org/browse/CORD-839
 
         elif self.accepts_add_remove_flow_updates:
             raise NotImplementedError()
diff --git a/voltha/core/flow_decomposer.py b/voltha/core/flow_decomposer.py
index 2d6aafb..8806aac 100644
--- a/voltha/core/flow_decomposer.py
+++ b/voltha/core/flow_decomposer.py
@@ -227,7 +227,8 @@
     return ofb_field(type=METADATA, table_metadata=_table_metadata)
 
 
-# TODO finish for rest of match fields
+# finish for rest of match fields
+# see https://jira.opencord.org/browse/CORD-840
 
 
 # frequently used extractors:
@@ -443,7 +444,8 @@
 
         ####################################################################
         #
-        # TODO this is a very limited, heuristics based implementation
+        # limited, heuristics based implementation
+        # needs to be replaced, see https://jira.opencord.org/browse/CORD-841
         #
         ####################################################################