diff --git a/tests/oft b/tests/oft
index cdf5af9..1ace47d 100755
--- a/tests/oft
+++ b/tests/oft
@@ -95,9 +95,10 @@
 
 Examine oft.log if things don't work.
 
-@todo Generate test catalog; support list, selection and grouping
+@todo Support per-component debug levels (esp controller vs dataplane)
+@todo Consider moving oft up a level
 
-Proposed test case setup:
+Current test case setup:
     Files in this or sub directories (or later, directory specified on 
 command line) that contain a function test_set_init are considered test
 files.
@@ -133,7 +134,6 @@
 
 ##@var config_default
 # The default configuration dictionary for OFT
-#@todo Set up a dict of config params so easier to manage
 config_default = {
     "platform"           : "local",
     "controller_host"    : "127.0.0.1",
@@ -150,6 +150,9 @@
     "port_map"           : {}
 }
 
+#@todo Set up a dict of config params so easier to manage:
+# <param> <cmdline flags> <default value> <help> <optional parser>
+
 # Map options to config structure
 def config_get(opts):
     "Convert options class to OFT configuration dictionary"
@@ -259,7 +262,7 @@
 
     Conventions:  Test files must implement the function test_set_init
 
-    Test cases are classes that implement testRun
+    Test cases are classes that implement runTest
 
     @param config The oft configuration dictionary
     @returns An array of triples (mod-name, module, [tests]) where