diff --git a/src/gen_tone.c b/src/gen_tone.c
index 400c2920..87caf5c7 100644
--- a/src/gen_tone.c
+++ b/src/gen_tone.c
@@ -709,15 +709,15 @@ int main ()
 	strlcpy (my_audio_config.adev[0].adevice_out, DEFAULT_ADEVICE, sizeof(my_audio_config.adev[0].adevice_out));
 
 	audio_open (&my_audio_config);
-	gen_tone_init (&my_audio_config, 100);
+	gen_tone_init (&my_audio_config, 100, 0);
 
 	for (r=0; r<2; r++) {
 
-	  for (n=0; n<my_audio_config.baud[0] * 2 ; n++) {
+	  for (n=0; n<my_audio_config.achan[0].baud * 2 ; n++) {
  	    tone_gen_put_bit ( chan1, 1 );
 	  }
 
-	  for (n=0; n<my_audio_config.baud[0] * 2 ; n++) {
+	  for (n=0; n<my_audio_config.achan[0].baud * 2 ; n++) {
  	    tone_gen_put_bit ( chan1, 0 );
 	  }
 	}
@@ -728,27 +728,27 @@ int main ()
 
 	memset (&my_audio_config, 0, sizeof(my_audio_config));
 	strlcpy (my_audio_config.adev[0].adevice_in, DEFAULT_ADEVICE, sizeof(my_audio_config.adev[0].adevice_in));
-	strlcpy (my_audio_config.adev[0].adevice_out, DEFAULT_ADEVICE, , sizeof(my_audio_config.adev[0].adevice_out));
+	strlcpy (my_audio_config.adev[0].adevice_out, DEFAULT_ADEVICE, sizeof(my_audio_config.adev[0].adevice_out));
 	my_audio_config.adev[0].num_channels = 2;
 
 	audio_open (&my_audio_config);
-	gen_tone_init (&my_audio_config, 100);
+	gen_tone_init (&my_audio_config, 100, 0);
 
 	for (r=0; r<4; r++) {
 
-	  for (n=0; n<my_audio_config.baud[0] * 2 ; n++) {
+	  for (n=0; n<my_audio_config.achan[0].baud * 2 ; n++) {
  	    tone_gen_put_bit ( chan1, 1 );
 	  }
 
-	  for (n=0; n<my_audio_config.baud[0] * 2 ; n++) {
+	  for (n=0; n<my_audio_config.achan[0].baud * 2 ; n++) {
  	    tone_gen_put_bit ( chan1, 0 );
 	  }
 
-	  for (n=0; n<my_audio_config.baud[0] * 2 ; n++) {
+	  for (n=0; n<my_audio_config.achan[0].baud * 2 ; n++) {
  	    tone_gen_put_bit ( chan2, 1 );
 	  }
 
-	  for (n=0; n<my_audio_config.baud[0] * 2 ; n++) {
+	  for (n=0; n<my_audio_config.achan[0].baud * 2 ; n++) {
  	    tone_gen_put_bit ( chan2, 0 );
 	  }
 	}