diff --git a/nucypher/characters/lawful.py b/nucypher/characters/lawful.py
index badb22958..cc37ff701 100644
--- a/nucypher/characters/lawful.py
+++ b/nucypher/characters/lawful.py
@@ -844,6 +844,8 @@ class Ursula(Teacher, Character, Miner):
                          timestamp=timestamp,
                          identity_evidence=identity_evidence,
                          substantiate_immediately=is_me and not federated_only,
+                         # FIXME: When is_me and not federated_only, the stamp is substantiated twice
+                         # See line 728 above.
                          )
 
         #
diff --git a/nucypher/network/server.py b/nucypher/network/server.py
index de571baa4..138e5d972 100644
--- a/nucypher/network/server.py
+++ b/nucypher/network/server.py
@@ -127,7 +127,7 @@ def make_rest_app(
     @rest_app.route("/public_information")
     def public_information():
         """
-        REST endpoint for public keys and address..
+        REST endpoint for public keys and address.
         """
         response = Response(
             response=node_bytes_caster(),
diff --git a/nucypher/policy/models.py b/nucypher/policy/models.py
index 1e186afd7..4ee9b464e 100644
--- a/nucypher/policy/models.py
+++ b/nucypher/policy/models.py
@@ -593,7 +593,7 @@ class WorkOrder:
         self.tasks = tasks
         self.receipt_signature = receipt_signature
         self.ursula = ursula  # TODO: We may still need a more elegant system for ID'ing Ursula.  See #136.
-        self.blockhash = blockhash or b'\x00' * 32  # TODO
+        self.blockhash = blockhash or b'\x00' * 32  # TODO: #259
         self.completed = False
 
     def __repr__(self):
@@ -688,14 +688,14 @@ class WorkOrder:
             metadata_as_signature = Signature.from_bytes(cfrag.proof.metadata)
             if not metadata_as_signature.verify(metadata_input, ursula_verifying_key):
                 raise InvalidSignature(f"Invalid metadata for {cfrag}.")
-                # TODO: Instead of raising, we should do something
+                # TODO: Instead of raising, we should do something (#957)
 
             # Validate re-encryption signatures
             if reencryption_signature.verify(bytes(cfrag), ursula_verifying_key):
                 good_cfrags.append(cfrag)
             else:
                 raise InvalidSignature(f"{cfrag} is not properly signed by Ursula.")
-                # TODO: Instead of raising, we should do something
+                # TODO: Instead of raising, we should do something (#957)
 
         for task, (cfrag, reencryption_signature) in zip(self.tasks, cfrags_and_signatures):
             task.attach_work_result(cfrag, reencryption_signature)
@@ -784,6 +784,7 @@ class Revocation:
         return True
 
 
+# TODO: Change name to EvaluationEvidence
 class IndisputableEvidence:
 
     def __init__(self,