diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index 8350c0a..fb69582 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -37,6 +37,7 @@ unsigned long long sr_4 = 0; //
 unsigned long long sr_5 = 0; //
 unsigned long long sr_6 = 0; //
 */
+int reset = 0;
 char c; //getch key
 int tg; //last tg
 int rd; //last rid
@@ -115,12 +116,7 @@ void ncursesOpen ()
   noecho();
   cbreak();
   fprintf (stderr, "Opening NCurses Terminal. \n");
-  //call_matrix[5-i][0] = 0;
-  //call_matrix[5-i][1] = 0;
-  //call_matrix[5-i][2] = 0;
-  //call_matrix[5-i][3] = 0;
-  //call_matrix[5-i][4] = 0;
-  //call_matrix[5-i][5] = time(NULL);
+
 }
 
 void
@@ -159,42 +155,6 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
 
   if ( (state->nxdn_last_rid != src && src > 0) || (state->nxdn_last_ran != rn && rn > 0) ) //find condition to make this work well, probably if last != local last variables
   {
-    /* //save just in case
-    call_matrix[0][0] = call_matrix[1][0];
-    call_matrix[0][1] = call_matrix[1][1];
-    call_matrix[0][2] = call_matrix[1][2];
-    call_matrix[0][3] = call_matrix[1][3];
-    call_matrix[0][4] = call_matrix[1][4];
-    call_matrix[0][5] = call_matrix[1][5];
-
-    call_matrix[1][0] = call_matrix[2][0];
-    call_matrix[1][1] = call_matrix[2][1];
-    call_matrix[1][2] = call_matrix[2][2];
-    call_matrix[1][3] = call_matrix[2][3];
-    call_matrix[1][4] = call_matrix[2][4];
-    call_matrix[1][5] = call_matrix[2][5];
-
-    call_matrix[2][0] = call_matrix[3][0];
-    call_matrix[2][1] = call_matrix[3][1];
-    call_matrix[2][2] = call_matrix[3][2];
-    call_matrix[2][3] = call_matrix[3][3];
-    call_matrix[2][4] = call_matrix[3][4];
-    call_matrix[2][5] = call_matrix[3][5];
-
-    call_matrix[3][0] = call_matrix[4][0];
-    call_matrix[3][1] = call_matrix[4][1];
-    call_matrix[3][2] = call_matrix[4][2];
-    call_matrix[3][3] = call_matrix[4][3];
-    call_matrix[3][4] = call_matrix[4][4];
-    call_matrix[3][5] = call_matrix[4][5];
-
-    call_matrix[4][0] = call_matrix[5][0];
-    call_matrix[4][1] = call_matrix[5][1];
-    call_matrix[4][2] = call_matrix[5][2];
-    call_matrix[4][3] = call_matrix[5][3];
-    call_matrix[4][4] = call_matrix[5][4];
-    call_matrix[4][5] = call_matrix[5][5];
-    */
     for (short int k = 0; k < 5; k++)
     {
       call_matrix[k][0] = call_matrix[k+1][0];
@@ -264,7 +224,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
   }
   if (opts->wav_out_file[0] != 0)
   {
-    printw ("| Writing audio wav to file %s\n", opts->wav_out_file);
+    printw ("| Writing Audio WAV to file %s\n", opts->wav_out_file);
   }
 
   printw ("------------------------------------------------------------------------------\n");
@@ -273,10 +233,12 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
   if (state->carrier == 1){ //figure out method that will tell me when is active and when not active, maybe carrier but this doesn't print anyways unless activity
     attron(COLOR_PAIR(3));
     level = (int) state->max / 164; //only update on carrier present
+    reset = 1;
   }
-  if (state->carrier == 0 && opts->reset_state == 1)
+  if (state->carrier == 0 && opts->reset_state == 1 && reset == 1)
   {
     resetState (state);
+    reset = 0;
   }
 
 
diff --git a/src/dsd_reset.c b/src/dsd_reset.c
index 3dc1663..e794701 100644
--- a/src/dsd_reset.c
+++ b/src/dsd_reset.c
@@ -103,5 +103,5 @@ resetState (dsd_state * state)
 //  state->debug_label_imbe_file = NULL;
 //#endif
 
-  initialize_p25_heuristics(&state->p25_heuristics); //see if we want to re-init this or not
+  initialize_p25_heuristics(&state->p25_heuristics); //see if we want to re-init this or not, currently seems to cause memory leak when running over and over
 }
diff --git a/src/rtl_sdr_fm.cpp b/src/rtl_sdr_fm.cpp
index 1c84320..75fb919 100644
--- a/src/rtl_sdr_fm.cpp
+++ b/src/rtl_sdr_fm.cpp
@@ -953,6 +953,7 @@ static void *socket_thread_fn(void *arg) {
 		if(buffer[0] == 0) {
 			new_freq = chars_to_int(buffer);
 			dongle.freq = new_freq; //
+			//opts->rtlsdr_center_freq = new_freq; //or dongle.freq, this should update the freq displayed in ncurses terminal hopefully and not do anything naughty
 			optimal_settings(new_freq, demod.rate_in);
 			rtlsdr_set_center_freq(dongle.dev, dongle.freq);
 			//fprintf (stderr, "Tuning to: %d [Hz] (central freq: %d [Hz])\n", new_freq, new_freq + freq_offset);
@@ -1156,7 +1157,7 @@ void cleanup_rtlsdr_stream()
   demod_cleanup(&demod);
   output_cleanup(&output);
   controller_cleanup(&controller);
-	
+
   rtlsdr_close(dongle.dev);
 
 }