modified:   base_node.py
	modified:   controller.py
	modified:   end-device.py
diff --git a/base_node.py b/base_node.py
index 03c7555..62a0fcf 100644
--- a/base_node.py
+++ b/base_node.py
@@ -216,3 +216,8 @@
                 if line.startswith('Serial'):
                     return line.split(':')[1].strip()
 
+
+def main():
+    b = BaseNode()
+
+main()
diff --git a/controller.py b/controller.py
index 9eee1ae..753cb4b 100644
--- a/controller.py
+++ b/controller.py
@@ -39,10 +39,11 @@
     def onInterest(self, prefix, interest, transport, registeredPrefixId):
         self._responseCount += 1
 
-        dump("interest ": interest)
+        dump("interest ", interest.getName())
+        dump("Uri ", interest.getName().toUri())
         # Make and sign a Data packet.
         #data = Data(interest.getName())
-        #content = "Echo " + interest.getName().toUri()
+        content = "Echo " + interest.getName().toUri()
         #data.setContent(content)
         #self._keyChain.sign(data, self._certificateName)
         #encodedData = data.wireEncode()
@@ -75,4 +76,4 @@
 
     face.shutdown()
 
-main()
\ No newline at end of file
+main()
diff --git a/end-device.py b/end-device.py
index a66447d..9a189be 100644
--- a/end-device.py
+++ b/end-device.py
@@ -51,11 +51,11 @@
     face.expressInterest(name1, device.onData, device.onTimeout)
 
 
-    while counter._callbackCount < 10:
+    while device._callbackCount < 10:
         face.processEvents()
         # We need to sleep for a few milliseconds so we don't use 100% of the CPU.
         time.sleep(0.01)
 
     face.shutdown()
 
-main()
\ No newline at end of file
+main()