diff --git a/ugly_hacks/santiago/README.rst b/ugly_hacks/santiago/README.rst
index 47c00c523..064c75b9c 100644
--- a/ugly_hacks/santiago/README.rst
+++ b/ugly_hacks/santiago/README.rst
@@ -519,9 +519,7 @@ Functional Questions
 Using Santiago
 ==============
 
-The Santiago service is mostly working now.  I still need to add PGP encryption,
-signing, decryption, and verification (and handle all the ``FIXME``\s and
-``TODO``\s in the code).
+The Santiago service is mostly working now.
 
 First, you'll need to create a certificate to serve Santiago over HTTPS::
 
@@ -530,8 +528,8 @@ First, you'll need to create a certificate to serve Santiago over HTTPS::
     # chgrp 1000 santiago.crt
     # chmod g+r santiago.crt
 
-Next, you'll need to open up ``start.sh`` and update the system path to locate the
-"gnupg_" and "cfg" modules.
+Next, you'll need to open up ``start.sh`` and update the system path to locate
+the "gnupg_" and "cfg" modules.
 
 .. _gnupg: https://code.google.com/p/python-gnupg/
 
diff --git a/ugly_hacks/santiago/santiago.py b/ugly_hacks/santiago/santiago.py
index ca234356c..5703287b1 100644
--- a/ugly_hacks/santiago/santiago.py
+++ b/ugly_hacks/santiago/santiago.py
@@ -173,7 +173,8 @@ class Santiago(object):
     def _get_protocol_module(cls, protocol):
         """Return the requested protocol module.
 
-        FIXME: Assumes the current directory is in sys.path
+        It assumes the Santiago directory is in sys.path, which seems to be a
+        fair assumption.
 
         """
         import_name = cls.CONTROLLER_MODULE.format(protocol)
@@ -627,8 +628,6 @@ class SantiagoListener(SantiagoConnector):
     def learn(self, host, service):
         """Request a service from another Santiago client.
 
-        TODO: add request whitelisting.
-
         """
         return self.santiago.query(host, service)