diff --git a/armada/handlers/armada.py b/armada/handlers/armada.py
index 97b819d9..4f1cfbce 100644
--- a/armada/handlers/armada.py
+++ b/armada/handlers/armada.py
@@ -301,6 +301,9 @@ class Armada(object):
                 deployed_releases = [x[0] for x in known_releases]
                 prefix_chart = release_prefix(prefix, release)
 
+                # TODO(mark-burnett): It may be more robust to directly call
+                # tiller status to decide whether to install/upgrade rather
+                # than checking for list membership.
                 if prefix_chart in deployed_releases:
 
                     # indicate to the end user what path we are taking
diff --git a/armada/handlers/tiller.py b/armada/handlers/tiller.py
index 85b7df9e..6a02f3e9 100644
--- a/armada/handlers/tiller.py
+++ b/armada/handlers/tiller.py
@@ -37,7 +37,7 @@ from armada.utils.release import label_selectors
 TILLER_VERSION = b'2.7.2'
 TILLER_TIMEOUT = 300
 GRPC_EPSILON = 60
-RELEASE_LIMIT = 64
+RELEASE_LIMIT = 128  # TODO(mark-burnett): There may be a better page size.
 RUNTEST_SUCCESS = 9
 
 # the standard gRPC max message size is 4MB
@@ -166,6 +166,8 @@ class Tiller(object):
         '''
         releases = []
         stub = ReleaseServiceStub(self.channel)
+        # TODO(mark-burnett): Since we're limiting page size, we need to
+        # iterate through all the pages when collecting this list.
         req = ListReleasesRequest(limit=RELEASE_LIMIT,
                                   status_codes=[STATUS_DEPLOYED,
                                                 STATUS_FAILED],