diff --git a/src/caw/cfg/main.cfg b/src/caw/cfg/main.cfg
index 88aca0d..ec756bc 100644
--- a/src/caw/cfg/main.cfg
+++ b/src/caw/cfg/main.cfg
@@ -8,7 +8,7 @@
 
     rt_sine_00: {
 
-      durLimitSecs:5.0,
+      dur_limit_secs:5.0,
 
       network: {
       
@@ -23,7 +23,7 @@
     sine_file_01: {
 
       non_real_time_fl:true,
-      durLimitSecs:5.0,
+      dur_limit_secs:5.0,
 
       network: {
 
@@ -35,11 +35,11 @@
     }
 
 
-    // Demonstrate simple signal processing and how to apply a processor class prefix.
+    // Demonstrate a simple signal processing network
     mod_sine_02: {
 
       non_real_time_fl:true,
-      durLimitSecs:5.0,
+      dur_limit_secs:5.0,
 
       network: {
 
@@ -57,7 +57,7 @@
     presets_03: {
 
       non_real_time_fl:true,
-      durLimitSecs:5.0,
+      dur_limit_secs:5.0,
       preset: "a",
 
       network: {
@@ -83,8 +83,8 @@
     // Demonstrate the `print` processor and event programming.
     program_04: {
     
-      non_real_time_fl:true,
-        durLimitSecs: 10.0,
+        non_real_time_fl:true,
+        dur_limit_secs: 10.0,
 	
 	network {
 	  procs: {
@@ -99,7 +99,7 @@
     mult_inputs_05: {
     
         non_real_time_fl:true,
-        durLimitSecs: 10.0,
+        dur_limit_secs: 10.0,
 	
 	network: {
 	  procs: {
@@ -115,12 +115,17 @@
       
    // Demonstrate different forms of the in-stmt
    mult_conn_06: {
+   
      non_real_time_fl:true,
-     durLimitSecs: 5.0,
+     dur_limit_secs: 5.0,
 
      network: {
        procs: {
-         osc:    { class: sine_tone, args: { chCnt:6, hz:[110,220,440,880,1760, 3520] }},
+         // Create an oscillator with a single audio output containing 6 channels.
+	 // Each of the channels is a different frequency.
+         osc:    { class: sine_tone, args: { ch_cnt:6, hz:[110,220,440,880,1760, 3520] }},
+	 
+	 // Split the single audio signal into three signals
          split:  { class: audio_split, in:{ in:osc.out }, args: { select:[ 0,0, 1,1, 2,2 ] } },
          
          // Create merge.in0,in1,in2 by iterating across all outputs of 'split'.
@@ -143,11 +148,11 @@
       // Demonstrate creating processors with explicit sfx-ids and connecting to them with a single in-stmt.
       proc_suffix_07: {
         non_real_time_fl:true,
-        durLimitSecs: 5.0,
+        dur_limit_secs: 5.0,
 
         network: {
           procs: {
-            osc:    { class: sine_tone, args: { chCnt:6, hz:[110,220,440,880,1760, 3520] }},
+            osc:    { class: sine_tone, args: { ch_cnt:6, hz:[110,220,440,880,1760, 3520] }},
             split:  { class: audio_split, in:{ in:osc.out }, args: { select:[ 0,0, 1,1, 2,2 ] } },
 
 	    // Create 3 audio gain controls with explicit sfx-ids
@@ -169,7 +174,7 @@
     mix_08: {
 
       non_real_time_fl:true,
-      durLimitSecs:5.0,
+      dur_limit_secs:5.0,
       
       network: {
 
@@ -190,7 +195,7 @@
    simple_poly_09: {
    
     non_real_time_fl:true,
-     durLimitSecs: 5.0,
+     dur_limit_secs: 5.0,
 
      network: {
 
@@ -205,7 +210,7 @@
 	   
 	    network: {
 	      procs: {
-	        lfo:  { class: sine_tone,   in:{ _.dc:_.dc_list.value_, _.gain:_.g_list.value_ }  args: { chCnt:1, hz:3 }},
+	        lfo:  { class: sine_tone,   in:{ _.dc:_.dc_list.value_, _.gain:_.g_list.value_ }  args: { ch_cnt:1, hz:3 }},
 	        sh:   { class: sample_hold, in:{ in:lfo.out }},
 	        osc:  { class: sine_tone,   in:{ hz: sh.out }},
 	      }
@@ -223,7 +228,7 @@
 
     feedback_10: {
           non_real_time_fl:true,
-          maxCycleCount:    10,
+          max_cycle_count:   10,
 
           network: {
             procs: {
@@ -238,7 +243,7 @@
 
     feedback_11: {
           non_real_time_fl:true,
-          maxCycleCount:    10,
+          max_cycle_count:    10,
 
           network: {
             procs: {
@@ -254,7 +259,7 @@
 
     sample_gen_13: {
       non_real_time_fl:false,
-      durLimitSecs: 30.0,
+      dur_limit_secs: 30.0,
       
       network: {
         procs: {
@@ -355,7 +360,7 @@
 
     poly_voice_18: {
       non_real_time_fl:false,
-      durLimitSecs:10,
+      dur_limit_secs:10,
       
       network: {
         procs: {
@@ -386,7 +391,7 @@
 
     midi_split_19: {
       non_real_time_fl:false,
-      durLimitSecs:10,
+      dur_limit_secs:10,
       
       network: {
         procs: {
@@ -407,7 +412,7 @@
     
     piano_voice_20: {
       non_real_time_fl:false,
-      durLimitSecs:30,
+      dur_limit_secs:30,
       
       network: {
         procs: {
@@ -440,11 +445,11 @@
     // Play stereo audio out channels 7&8 of the Scarlett.
     audio_test_21: {
       non_real_time_fl:false,
-      durLimitSecs:10,
+      dur_limit_secs:10,
       network: {
         procs:  {
 	  asil: { class:audio_silence, args:{ ch_cnt:6 }}
-	  osc: { class:sine_tone, args:{ hz:440.0, chCnt:2 }},
+	  osc: { class:sine_tone, args:{ hz:440.0, ch_cnt:2 }},
 	  amrg: { class:audio_merge, in:{ in0:asil.out, in1:osc.out }, args:{ out_gain:1 } },
 	  amtr: { class:audio_meter, in:{ in:amrg.out }, args:{ rpt_ms:500 }},
 	  aout:{ class:audio_out, in:{ in:amrg.out }, args:{ dev_label:"main"} }
@@ -455,7 +460,7 @@
 
     piano_voice_22: {
       non_real_time_fl:false,
-      //durLimitSecs:300,
+      //dur_limit_secs:300,
       
       network: {
         procs: {
diff --git a/src/caw/main.cpp b/src/caw/main.cpp
index cc2cec4..f94ae54 100644
--- a/src/caw/main.cpp
+++ b/src/caw/main.cpp
@@ -275,7 +275,7 @@ void _print_command_line_help()
     "Usage:\n"
     "       caw exec      <program_cfg_fname> <program_label>\n"
     "       caw hw_report <program_cfg_fname> <program_label>\n"
-    "       caw test <test_cfg_fname> (<module_label> | all) (<test_label> | all) (compare | echo | gen_report )* {args ...}"
+    "       caw test <test_cfg_fname> (<module_label> | all) (<test_label> | all) (compare | echo | gen_report )* {args ...}\n"
     "       caw test_stub ...\n";
     
   cwLogPrint(usage);