diff --git a/composer/message/instance.py b/composer/message/instance.py
index 86666fd..62a78f4 100644
--- a/composer/message/instance.py
+++ b/composer/message/instance.py
@@ -51,6 +51,7 @@ class MessageInstance(Instance):
         if data is None:
             data = {}
         request = data.get('request') or TestRequest()
+        # if 'url' not in data:
         data['url'] = self.getClientUrl(request)
         dp = DataProvider(self, data)
         text = MessageTemplate(self.template.text).safe_substitute(dp)
@@ -103,6 +104,8 @@ class DataProvider(object):
             mi = MessageInstance(client, messageManager.messages[key],
                                  messageManager)
             return mi.applyTemplate()['text']
+            # TODO: use available data, esp request
+            #return mi.applyTemplate(self.data)['text']
         elif '.' in key:
             if client is None:
                 return '$' + key
diff --git a/organize/browser/service.py b/organize/browser/service.py
index e718864..f90823c 100644
--- a/organize/browser/service.py
+++ b/organize/browser/service.py
@@ -323,6 +323,8 @@ class ServiceView(BaseView):
 
     @Lazy
     def registeredTotalSubmitted(self):
+        # TODO: clean-up temporary registrations
+        # return self.context.getNumberRegistered()
         total = 0
         for reg in self.getRegistrations().values():
             state = IStateful(reg).getStateObject()
diff --git a/organize/service.py b/organize/service.py
index fc6d2f7..472c6ae 100644
--- a/organize/service.py
+++ b/organize/service.py
@@ -170,6 +170,7 @@ class Service(object):
             reg = self.registrations[clientName]
             if number != reg.number:
                 reg.number = number
+                # TODO: set timeStamp
             return reg
         reg = self.registrationFactory(client, self, number)
         self.registrations[clientName] = reg