diff --git a/bin/mn b/bin/mn
index 474a3c2..5bab076 100755
--- a/bin/mn
+++ b/bin/mn
@@ -255,7 +255,7 @@ class MininetRunner( object ):
 
         if self.options.nat:
             nat = mn.addNAT()
-            mn.configHosts()
+            nat.configDefault()
 
         if self.options.pre:
             CLI( mn, script=self.options.pre )
diff --git a/examples/natnet.py b/examples/natnet.py
index cb0c44c..7f51fd5 100755
--- a/examples/natnet.py
+++ b/examples/natnet.py
@@ -26,7 +26,7 @@ from mininet.cli import CLI
 from mininet.util import irange
 
 class InternetTopo(Topo):
-    "Single switch connected to n hosts."
+    "TODO: Single switch connected to n hosts."
     def __init__(self, n=2, h=1, **opts):
         Topo.__init__(self, **opts)
 
@@ -57,7 +57,7 @@ class InternetTopo(Topo):
             self.addLink(host, switch)
 
 def run():
-    "Create network and run simple performance test"
+    "TODO: Create network and run simple performance test"
     topo = InternetTopo()
     net = Mininet(topo=topo)
     net.start()
diff --git a/mininet/node.py b/mininet/node.py
index edc6de8..dba383d 100644
--- a/mininet/node.py
+++ b/mininet/node.py
@@ -36,6 +36,8 @@ RemoteController: a remote controller node, which may use any
     arbitrary OpenFlow-compatible controller, and which is not
     created or managed by mininet.
 
+TODO: NAT
+
 Future enhancements:
 
 - Possibly make Node, Switch and Controller more abstract so that
@@ -1309,4 +1311,3 @@ class NAT( Node ):
         self.cmd( 'sysctl net.ipv4.ip_forward=0' )
 
         super( NAT, self ).terminate()
-