diff --git a/patch/cretu_no_dmr_idle.patch b/patch/cretu_no_dmr_idle.patch
new file mode 100644
index 0000000..0e0de8e
--- /dev/null
+++ b/patch/cretu_no_dmr_idle.patch
@@ -0,0 +1,277 @@
+diff --git a/include/dsd.h b/include/dsd.h
+index 9ebf3f1..c5ac68a 100644
+--- a/include/dsd.h
++++ b/include/dsd.h
+@@ -18,16 +18,16 @@
+  */
+ 
+ //defined by CMakeLists.txt -- Disable by using cmake -DCOLORS=OFF ..
+-#ifdef PRETTY_COLORS
+-#define KNRM  "\x1B[0m"
+-#define KRED  "\x1B[31m"
+-#define KGRN  "\x1B[32m"
+-#define KYEL  "\x1B[33m"
+-#define KBLU  "\x1B[34m"
+-#define KMAG  "\x1B[35m"
+-#define KCYN  "\x1B[36m"
+-#define KWHT  "\x1B[37m"
+-#else
++// #ifdef PRETTY_COLORS
++// #define KNRM  "\x1B[0m"
++// #define KRED  "\x1B[31m"
++// #define KGRN  "\x1B[32m"
++// #define KYEL  "\x1B[33m"
++// #define KBLU  "\x1B[34m"
++// #define KMAG  "\x1B[35m"
++// #define KCYN  "\x1B[36m"
++// #define KWHT  "\x1B[37m"
++// #else
+ #define KNRM  ""
+ #define KRED  ""
+ #define KGRN  ""
+@@ -36,7 +36,7 @@
+ #define KMAG  ""
+ #define KCYN  ""
+ #define KWHT  ""
+-#endif
++// #endif
+ 
+ #include "config.h"
+ #include <stdio.h>
+diff --git a/src/dmr_bs.c b/src/dmr_bs.c
+index bdab262..17a9e70 100644
+--- a/src/dmr_bs.c
++++ b/src/dmr_bs.c
+@@ -266,14 +266,14 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
+   if ( strcmp (sync, DMR_BS_DATA_SYNC) == 0 )
+   {
+     
+-    fprintf (stderr,"%s ", timestr);
++    // fprintf (stderr,"%s ", timestr);
+     if (internalslot == 0)
+     {
+       if (opts->inverted_dmr == 0)
+       {
+-        fprintf (stderr,"Sync: +DMR  ");
++        // fprintf (stderr,"Sync: +DMR  ");
+       }
+-      else fprintf (stderr,"Sync: -DMR  ");
++      else {}//fprintf (stderr,"Sync: -DMR  ");
+       
+       vc1 = 7; //set to 7 so we can see that we should not be on a VC unless a framesync comes in for it first
+ 
+@@ -284,9 +284,9 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
+     {
+       if (opts->inverted_dmr == 0)
+       {
+-        fprintf (stderr,"Sync: +DMR  ");
++        // fprintf (stderr,"Sync: +DMR  ");
+       }
+-      else fprintf (stderr,"Sync: -DMR  ");
++      else {}//fprintf (stderr,"Sync: -DMR  ");
+ 
+       vc2 = 7; //set to 7 so we can see that we should not be on a VC unless a framesync comes in for it first
+ 
+diff --git a/src/dmr_data.c b/src/dmr_data.c
+index 87f4dfd..57e5647 100644
+--- a/src/dmr_data.c
++++ b/src/dmr_data.c
+@@ -232,10 +232,10 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
+     sprintf(state->slot2light, "[sLoT2]");
+   }
+ 
+-  if (state->dmr_ms_mode == 0)
+-  {
+-    fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
+-  }
++  // if (state->dmr_ms_mode == 0)
++  // {
++  //   fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
++  // }
+ 
+   // Slot type - Second part - Parity bit
+   for (i = 0; i < 5; i++)
+@@ -292,6 +292,13 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
+     info[(2*i) + 98] = (1 & (dibit >> 1));  // bit 1
+     info[(2*i) + 99] = (1 & dibit);         // bit 0
+   }
++
++  // if (state->dmr_ms_mode == 0 && burst != 0x09)
++  if (burst != 0x09)
++  {
++    printFrameSync (opts, state, "+DMR ", 90, NULL); //don't think the values matter
++    fprintf(stderr, "%s %s ", state->slot1light, state->slot2light);
++  }
+   
+   //don't run on MS Reverse Channel Data
+   if (state->dmr_ms_rc == 0) dmr_data_burst_handler(opts, state, (uint8_t *)info, burst);
+@@ -303,15 +310,16 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state)
+   } 
+ 
+   //ending line break
+-  fprintf(stderr, "\n");
++  if (burst != 0x09)
++    fprintf(stderr, "\n");
+ 
+   END:
+   if (SlotTypeOk == 0 || cach_okay != 1)
+   {
+-    fprintf (stderr, "%s", KRED);
+-    fprintf (stderr, "| CACH/Burst FEC ERR");
+-    fprintf (stderr, "%s", KNRM);
+-    fprintf (stderr, "\n");
++    // fprintf (stderr, "%s", KRED);
++    // fprintf (stderr, "| CACH/Burst FEC ERR");
++    // fprintf (stderr, "%s", KNRM);
++    // fprintf (stderr, "\n");
+     dmr_reset_blocks (opts, state); //failsafe to reset all data header and blocks when bad tact or slottype
+   }
+ 
+diff --git a/src/dmr_dburst.c b/src/dmr_dburst.c
+index fe81158..078524d 100644
+--- a/src/dmr_dburst.c
++++ b/src/dmr_dburst.c
+@@ -205,7 +205,7 @@ void dmr_data_burst_handler(dsd_opts * opts, dsd_state * state, uint8_t info[196
+   //flag off prop head when not looking at data blocks
+   if (databurst != 0x6 && databurst != 0x7 && databurst != 0x8 && databurst != 0xA && databurst != 0xB) state->data_p_head[slot] = 0;
+ 
+-  if (databurst != 0xEB)
++  if (databurst != 0xEB && databurst != 0x09)
+   {
+     if (state->dmr_ms_mode == 0)
+     { 
+diff --git a/src/dmr_flco.c b/src/dmr_flco.c
+index 839b085..e43b568 100644
+--- a/src/dmr_flco.c
++++ b/src/dmr_flco.c
+@@ -790,21 +790,23 @@ uint8_t dmr_cach (dsd_opts * opts, dsd_state * state, uint8_t cach_bits[25])
+     crc = crc8_ok(slco_bits, 36);
+ 
+     //only run SLCO on good everything
+-    if (h1 && h2 && h3 && crc) dmr_slco (opts, state, slco_bits);
+-    else
+-    {
+-      //this line break issue is wracking on my OCD for clean line breaks
+-      if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) ; //no line break if current slot is voice with payload enabled
+-      else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) ; //no line break if current slot is voice with payload enabled
+-      else fprintf (stderr, "\n");
+-      fprintf (stderr, "%s", KRED);
+-      fprintf (stderr, " SLCO CRC ERR");
+-      fprintf (stderr, "%s", KNRM);
+-      if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) //if current slot is voice with payload enabled
+-        fprintf (stderr, "\n");
+-      else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) //if current slot is voice with payload enabled
+-        fprintf (stderr, "\n");
+-    } 
++    if (h1 && h2 && h3 && crc) {} //dmr_slco (opts, state, slco_bits);
++    // else
++    // {
++    //   //this line break issue is wracking on my OCD for clean line breaks
++    //   if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) {} //no line break if current slot is voice with payload enabled
++    //   else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) {} //no line break if current slot is voice with payload enabled
++    //   else {} //fprintf (stderr, "\n");
++    //   // fprintf (stderr, "%s", KRED);
++    //   // fprintf (stderr, " SLCO CRC ERR");
++    //   // fprintf (stderr, "%s", KNRM);
++    //   if (opts->payload == 1 && state->dmrburstL == 16 && state->currentslot == 0) //if current slot is voice with payload enabled
++    //     fprintf (stderr, "\n");
++    //   else if (opts->payload == 1 && state->dmrburstR == 16 && state->currentslot == 1) //if current slot is voice with payload enabled
++    //     fprintf (stderr, "\n");
++    // } 
++
++    UNUSED(opts);
+     
+   }
+   return (err); //return err value based on success or failure, even if we aren't checking it
+@@ -935,8 +937,11 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
+   uint8_t xpt_hash = (uint8_t)ConvertBitIntoBytes(&slco_bits[20], 8); //priority TG hash
+ 
+   //initial line break
+-  fprintf (stderr, "\n");
+-  fprintf (stderr, "%s", KYEL);
++  if (slco != 0)
++  {
++    fprintf (stderr, "\n");
++    fprintf (stderr, "%s", KYEL);
++  }
+ 
+   if (slco == 0x2) //C_SYS_Parms
+   {
+@@ -973,7 +978,8 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
+     else sprintf (state->dmr_site_parms, "TIII %s:%d-%d;%04X; ", model_str, net, site, syscode);
+   }
+   else if (slco == 0x0) //null
+-    fprintf (stderr, " SLCO NULL ");
++    // fprintf (stderr, " SLCO NULL ");
++    {}
+   else if (slco == 0x1)
+   {
+     fprintf (stderr, " Activity Update"); //102 361-2 7.1.3.2
+diff --git a/src/dsd_frame_sync.c b/src/dsd_frame_sync.c
+index 062bb20..f47a447 100644
+--- a/src/dsd_frame_sync.c
++++ b/src/dsd_frame_sync.c
+@@ -940,7 +940,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
+                 sprintf(state->ftype, "DMR ");
+                 if (opts->errorbars == 1)
+                 {
+-                  printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
++                  // printFrameSync (opts, state, "+DMR ", synctest_pos + 1, modulation);
+                 }
+                 state->lastsynctype = 10;
+                 state->last_cc_sync_time = time(NULL); 
+@@ -1068,7 +1068,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
+                 sprintf(state->ftype, "DMR ");
+                 if (opts->errorbars == 1) //&& opts->dmr_stereo == 0
+                 {
+-                  printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
++                  // printFrameSync (opts, state, "-DMR ", synctest_pos + 1, modulation);
+                 }
+                 state->lastsynctype = 13;
+                 state->last_cc_sync_time = time(NULL); 
+@@ -1443,7 +1443,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
+             {
+               if ((opts->errorbars == 1) && (opts->verbose > 1) && (state->carrier == 1))
+                 {
+-                  fprintf (stderr,"Sync: no sync\n");
++                  // fprintf (stderr,"Sync: no sync\n");
+                   // fprintf (stderr,"Press CTRL + C to close.\n"); 
+ 
+                 }
+diff --git a/src/dsd_main.c b/src/dsd_main.c
+index 98f2ead..b09cb81 100644
+--- a/src/dsd_main.c
++++ b/src/dsd_main.c
+@@ -1687,7 +1687,7 @@ main (int argc, char **argv)
+   }
+ 
+   #ifdef AERO_BUILD
+-  fprintf (stderr, "Build Version: AW (20231015) \n");
++  fprintf (stderr, "Build Version: AW (20240523) \n");
+   #else
+   fprintf (stderr, "Build Version: AW %s \n", GIT_TAG);
+   #endif
+diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
+index a5442af..514b9ae 100644
+--- a/src/dsd_ncurses.c
++++ b/src/dsd_ncurses.c
+@@ -2423,7 +2423,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+   if (opts->ncurses_compact == 1)
+   {
+     printw ("------------------------------------------------------------------------------\n");
+-    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20231015)");
++    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20240523)");
+     printw ("------------------------------------------------------------------------------\n");
+   }
+ #elif LIMAZULUTWEAKS
+@@ -2462,8 +2462,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
+       if (i == 4 && opts->frame_m17 == 1) printw (" CODEC2");
+       #endif
+       #ifdef AERO_BUILD
+-      if (i == 5) printw (" %s ", "Aero Build");
+-      if (i == 6) printw (" AW (20231015) \n");
++      if (i == 5) printw (" %s ", "Cretu Build");
++      if (i == 6) printw (" AW (20240523) \n");
+       #elif ZDEV_BUILD
+       if (i == 5) printw (" %s ", "AW ");
+       if (i == 6) printw (" %s \n", GIT_TAG);
diff --git a/patch/g_dmr_per_call_wav_file_fixes_w_custom_wav_dir_20240328.patch b/patch/g_dmr_per_call_wav_file_fixes_w_custom_wav_dir_20240328.patch
deleted file mode 100644
index e2835e9..0000000
--- a/patch/g_dmr_per_call_wav_file_fixes_w_custom_wav_dir_20240328.patch
+++ /dev/null
@@ -1,441 +0,0 @@
-diff --git a/src/dmr_csbk.c b/src/dmr_csbk.c
-index 208454c..ce9673e 100644
---- a/src/dmr_csbk.c
-+++ b/src/dmr_csbk.c
-@@ -463,6 +463,25 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
-               //rigctl
-               if (opts->use_rigctl == 1)
-               {
-+                if (state->currentslot == 0)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+                  {
-+                    closeWavOutFileL (opts, state);
-+                    opts->wav_out_f = NULL;
-+                  }
-+                }
-+                else if (state->currentslot == 1)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+                  {
-+                    closeWavOutFileR (opts, state);
-+                    opts->wav_out_fR = NULL;
-+                  }
-+                }
-+
-                 //Guess I forgot to add this condition here
-                 if (GetCurrentFreq(opts->rigctl_sockfd) != state->p25_cc_freq)
-                   dmr_reset_blocks (opts, state); //reset all block gathering since we are tuning away from current frequency
-@@ -497,6 +516,26 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
-               else if (opts->audio_in_type == 3)
-               {
-                 #ifdef USE_RTLSDR
-+                
-+                if (state->currentslot == 0)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+                  {
-+                    closeWavOutFileL (opts, state);
-+                    opts->wav_out_f = NULL;
-+                  }
-+                }
-+                else if (state->currentslot == 1)
-+                {
-+                  //close any perCall wav files that are open
-+                  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+                  {
-+                    closeWavOutFileR (opts, state);
-+                    opts->wav_out_fR = NULL;
-+                  }
-+                }
-+
-                 //Guess I forgot to add this condition here
-                 uint32_t tempf = (uint32_t)state->p25_cc_freq;
-                 if (opts->rtlsdr_center_freq != tempf)
-diff --git a/src/dmr_flco.c b/src/dmr_flco.c
-index 19cd3a6..a950fc4 100644
---- a/src/dmr_flco.c
-+++ b/src/dmr_flco.c
-@@ -10,6 +10,38 @@
-  *-----------------------------------------------------------------------------*/
- 
- #include "dsd.h"
-+//I really just need to make ONE consolidated date and time function that works correctly
-+char * getDateFLC(void) {
-+  #ifdef AERO_BUILD
-+  char datename[80];
-+  #else
-+  char datename[99];
-+  #endif
-+  char * curr2;
-+  struct tm * to;
-+  time_t t;
-+  t = time(NULL);
-+  to = localtime( & t);
-+  strftime(datename, sizeof(datename), "%Y%m%d", to);
-+  curr2 = strtok(datename, " ");
-+  return curr2;
-+}
-+
-+//fix from YorgosTheodorakis fork -- https://github.com/YorgosTheodorakis/dsd-fme/commit/7884ee555521a887d388152b3b1f11f20433a94b
-+char * getTimeFLC(void) //get pretty hhmmss timestamp
-+{
-+  char * curr = (char *) malloc(9);
-+  time_t t = time(NULL);
-+  struct tm * ptm = localtime(& t);
-+  sprintf(
-+    curr,
-+    "%02d%02d%02d",
-+    ptm->tm_hour,
-+    ptm->tm_min,
-+    ptm->tm_sec
-+  );
-+  return curr;
-+}
- 
- //combined flco handler (vlc, tlc, emb), minus the superfluous structs and strings
- void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t CRCCorrect, uint32_t IrrecoverableErrors, uint8_t type)
-@@ -304,6 +336,14 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
-         state->dmr_so = so;
-         state->lasttg = target;
-         state->lastsrc = source;
-+        char * timestr;
-+        timestr = getTimeFLC();
-+        //open wav file here if not already opened
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_f == NULL)
-+        {
-+          sprintf (opts->wav_out_file, "./%s/%s %s CC %d - TG %d - RD %d", opts->wav_out_dir, getDateFLC(), timestr, state->dmr_color_code, target, source);
-+          openWavOutFileL (opts, state);
-+        }
-       }
-       if (state->currentslot == 1)
-       {
-@@ -311,6 +351,14 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
-         state->dmr_soR = so;
-         state->lasttgR = target;
-         state->lastsrcR = source;
-+        char * timestr;
-+        timestr = getTimeFLC();
-+        //open wav file here if not already opened
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR == NULL)
-+        {
-+          sprintf (opts->wav_out_fileR, "./%s/%s %s CC %d - TG %d - RD %d", opts->wav_out_dir, getDateFLC(), timestr, state->dmr_color_code, target, source);
-+          openWavOutFileR (opts, state);
-+        }
-       }
- 
-       //update cc amd vc sync time for trunking purposes (particularly Con+)
-@@ -337,6 +385,12 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
-         //reset gain
-         if (opts->floating_point == 1)
-           state->aout_gain = opts->audio_gain;
-+        //close any perCall wav files that are open
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+        {
-+          closeWavOutFileL (opts, state);
-+          opts->wav_out_f = NULL;
-+        }
-       }
-       if (state->currentslot == 1)
-       {
-@@ -350,6 +404,12 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
-         //reset gain
-         if (opts->floating_point == 1)
-           state->aout_gainR = opts->audio_gain; 
-+        //close any perCall wav files that are open
-+        if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+        {
-+          closeWavOutFileR (opts, state);
-+          opts->wav_out_fR = NULL;
-+        }
-       }
-       
-     }
-diff --git a/src/dsd_file.c b/src/dsd_file.c
-index 67607e5..dae7862 100644
---- a/src/dsd_file.c
-+++ b/src/dsd_file.c
-@@ -563,6 +563,19 @@ void closeWavOutFile (dsd_opts * opts, dsd_state * state)
-   UNUSED(state);
- 
-   sf_close(opts->wav_out_f);
-+  char shell[2065], newfilename[1032];
-+  int result;
-+  sprintf (newfilename, "%s.wav", opts->wav_out_file);
-+#ifdef AERO_BUILD
-+  result = rename (opts->wav_out_file, newfilename);
-+  UNUSED(shell);
-+#else
-+  sprintf (shell, "mv '%s' '%s'", opts->wav_out_file, newfilename);
-+  result = system (shell);
-+#endif
-+  // fprintf (stderr, "\n Close WAV FileF %s; Result: %d \n", newfilename, result);
-+  UNUSED(result);
-+
- }
- 
- void closeWavOutFileL (dsd_opts * opts, dsd_state * state)
-@@ -570,6 +583,19 @@ void closeWavOutFileL (dsd_opts * opts, dsd_state * state)
-   UNUSED(state);
- 
-   sf_close(opts->wav_out_f);
-+  char shell[2065], newfilename[1032];
-+  int result;
-+  sprintf (newfilename, "%s.wav", opts->wav_out_file);
-+#ifdef AERO_BUILD
-+  result = rename (opts->wav_out_file, newfilename);
-+  UNUSED(shell);
-+#else
-+  sprintf (shell, "mv '%s' '%s'", opts->wav_out_file, newfilename);
-+  result = system (shell);
-+#endif
-+  // fprintf (stderr, "\n Close WAV FileL %s; Result: %d \n", newfilename, result);
-+  UNUSED(result);
-+
- }
- 
- void closeWavOutFileR (dsd_opts * opts, dsd_state * state)
-@@ -577,6 +603,18 @@ void closeWavOutFileR (dsd_opts * opts, dsd_state * state)
-   UNUSED(state);
- 
-   sf_close(opts->wav_out_fR);
-+  char shell[2065], newfilename[1032];
-+  int result;
-+  sprintf (newfilename, "%s.wav", opts->wav_out_fileR);
-+#ifdef AERO_BUILD
-+  result = rename (opts->wav_out_fileR, newfilename);
-+  UNUSED(shell);
-+#else
-+  sprintf (shell, "mv '%s' '%s'", opts->wav_out_fileR, newfilename);
-+  result = system (shell);
-+#endif
-+  // fprintf (stderr, "\n Close WAV FileR %s; Result: %d \n", newfilename, result);
-+  UNUSED(result);
- }
- 
- void closeWavOutFileRaw (dsd_opts * opts, dsd_state * state)
-diff --git a/src/dsd_main.c b/src/dsd_main.c
-index 3ca7788..8d883cd 100644
---- a/src/dsd_main.c
-+++ b/src/dsd_main.c
-@@ -107,6 +107,32 @@ void
- noCarrier (dsd_opts * opts, dsd_state * state)
- {
- 
-+  //close any perCall wav files that are open
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+  {
-+    closeWavOutFileL (opts, state);
-+    opts->wav_out_f = NULL;
-+  }
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+  {
-+    closeWavOutFileR (opts, state);
-+    opts->wav_out_fR = NULL;
-+  }
-+  //end perCall wav file close
-+
-+  //close any perCall wav files that are open
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_f != NULL)
-+  {
-+    closeWavOutFileL (opts, state);
-+    opts->wav_out_f = NULL;
-+  }
-+  if (opts->dmr_stereo_wav == 1 && opts->wav_out_fR != NULL)
-+  {
-+    closeWavOutFileR (opts, state);
-+    opts->wav_out_fR = NULL;
-+  }
-+  //end perCall wav file close
-+
- // #ifdef AERO_BUILD //NOTE: Blame seems to be synctest8 not being initialized (will continue to test)
- // //TODO: Investigate why getSymbol needs to be run first in this context...truly confused here
- // if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
-@@ -1645,9 +1671,9 @@ main (int argc, char **argv)
-   }
- 
-   #ifdef AERO_BUILD
--  fprintf (stderr, "Build Version: AW (20231015) \n");
-+  fprintf (stderr, "Build Version: AW (20240328) G Build\n");
-   #else
--  fprintf (stderr, "Build Version: AW %s \n", GIT_TAG);
-+  fprintf (stderr, "Build Version: AW %s G Build\n", GIT_TAG);
-   #endif
-   fprintf (stderr,"MBElib Version: %s\n", versionstr);
- 
-diff --git a/src/dsd_mbe.c b/src/dsd_mbe.c
-index 07075c8..9cef1a3 100644
---- a/src/dsd_mbe.c
-+++ b/src/dsd_mbe.c
-@@ -1197,7 +1197,8 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
-     if (state->dmr_encL == 0 || opts->dmr_mute_encL == 0)
-     {
-       //write wav to per call on left channel Slot 1
--      writeSynthesizedVoice (opts, state);
-+      if (opts->wav_out_f != NULL)
-+        writeSynthesizedVoice (opts, state);
-     }
-   }
- 
-@@ -1207,7 +1208,8 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a
-     if (state->dmr_encR == 0 || opts->dmr_mute_encR == 0)
-     {
-       //write wav to per call on right channel Slot 2
--      writeSynthesizedVoiceR (opts, state);
-+      if (opts->wav_out_fR != NULL)
-+        writeSynthesizedVoiceR (opts, state);
-     }
-   }
- 
-diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
-index 73965dc..9a4e93e 100644
---- a/src/dsd_ncurses.c
-+++ b/src/dsd_ncurses.c
-@@ -1014,7 +1014,7 @@ void ncursesMenu (dsd_opts * opts, dsd_state * state)
-         if (choicec == 12)
-         {
-           //flesh out all closewavs and sprint "" wav filenames
--          closeWavOutFile (opts, state);
-+          // closeWavOutFile (opts, state);
-           closeWavOutFileL (opts, state);
-           closeWavOutFileR (opts, state);
-           //closeWavOutFileRaw (opts, state);
-@@ -2085,6 +2085,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     if (opts->dmr_stereo_wav == 1 && src != 0 ) //&& tgn != 0, some TG can be 0 on NXDN
-     {
-       //close old first, assign name based on time and radio, open wav file
-+      if (opts->wav_out_f != NULL)
-       closeWavOutFileL (opts, state);
-       sprintf (opts->wav_out_file, "./%s/%s %s NXDN - RAN %d - TGT %d - SRC %d.wav", opts->wav_out_dir, getDateN(), timestr, rn, tgn, src);
-       openWavOutFileL (opts, state); //testing for now, will want to move to per call later
-@@ -2127,13 +2128,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     call_matrix[9][5] = time(NULL);
- 
-     //open wav file if enabled and both rd and tg are not 0
--    if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
--    {
--      //close old first, assign name based on time and radio, open wav file
--      closeWavOutFileL (opts, state);
--      sprintf (opts->wav_out_file, "./%s/%s %s MS - CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, getDateN(), timestr, dcc, tg, rd);
--      openWavOutFileL (opts, state); //testing for now, will want to move to per call later
--    }
-+    // if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
-+    // {
-+    //   //close old first, assign name based on time and radio, open wav file
-+    //   if (opts->wav_out_f != NULL)
-+    //     closeWavOutFileL (opts, state);
-+    //   sprintf (opts->wav_out_file, "./%s/%s %s MS - CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, getDateN(), timestr, dcc, tg, rd);
-+    //   openWavOutFileL (opts, state); //testing for now, will want to move to per call later
-+    // }
- 
-     if (opts->call_alert == 1 && rd != 0 && tg != 0)
-     {
-@@ -2148,7 +2150,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   }
- 
-   //DMR BS Slot 1 - matrix 0-4
--  if ( call_matrix[4][2] != rd && (lls == 11 || lls == 12 || lls == 10 || lls == 13 || lls == 35 || lls == 36) )
-+  if ( call_matrix[4][2] != rd && (lls == 11 || lls == 12 || lls == 10 || lls == 13 ) ) //|| lls == 35 || lls == 36
-   {
- 
-     for (short int k = 0; k < 4; k++)
-@@ -2169,14 +2171,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     call_matrix[4][5] = time(NULL);
- 
-     //open wav file if enabled and both rd and tg are not 0
--    if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
--    {
--      //close old first, assign name based on time and radio, open wav file
--      closeWavOutFileL (opts, state);
--
--      sprintf (opts->wav_out_file, "./%s/%s %s CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, getDateN(), timestr, dcc, tg, rd);
--      openWavOutFileL (opts, state); //testing for now, will want to move to per call later
--    }
-+    // if (opts->dmr_stereo_wav == 1 && rd != 0 && tg != 0)
-+    // {
-+    //   //close old first, assign name based on time and radio, open wav file
-+    //   if (opts->wav_out_f != NULL)
-+    //     closeWavOutFileL (opts, state);
-+    //   sprintf (opts->wav_out_file, "./%s/%s %s CC %d - TG %d - RD %d",  opts->wav_out_dir, getDateN(), timestr, dcc, tg, rd);
-+    //   openWavOutFileL (opts, state); //testing for now, will want to move to per call later
-+    // }
- 
-     if (opts->call_alert == 1 && rd != 0 && tg != 0)
-     {
-@@ -2212,20 +2214,21 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-     call_matrix[9][5] = time(NULL);
- 
-     //open wav file if enabled and both rdR and tgR are not 0
--    if (opts->dmr_stereo_wav == 1 && rdR != 0 && tgR != 0)
--    {
--      //close old first, assign name based on time and radio, open wav file
--      closeWavOutFileR (opts, state);
--      sprintf (opts->wav_out_fileR, "./%s/%s %s CC %d - TG %d - RD %d.wav",  opts->wav_out_dir, getDateN(), timestr, dcc, tgR, rdR);
--      openWavOutFileR (opts, state); //testing for now, will want to move to per call later
--    }
-+    // if (opts->dmr_stereo_wav == 1 && rdR != 0 && tgR != 0)
-+    // {
-+    //   //close old first, assign name based on time and radio, open wav file
-+    //   if (opts->wav_out_fR != NULL)
-+    //     closeWavOutFileR (opts, state);
-+    //   sprintf (opts->wav_out_fileR, "./%s/%s %s CC %d - TG %d - RD %d",  opts->wav_out_dir, getDateN(), timestr, dcc, tgR, rdR);
-+    //   openWavOutFileR (opts, state); //testing for now, will want to move to per call later
-+    // }
- 
--    if (opts->call_alert == 1 && rdR != 0 && tgR != 0)
--    {
--      //fprintf (stderr, "BEEP 1 BS RIGHT\n");
--      beeper (opts, state, 1);
--      state->dmr_end_alert[1] = 0; //new voice frame, okay to beep at the end of it
--    }
-+    // if (opts->call_alert == 1 && rdR != 0 && tgR != 0)
-+    // {
-+    //   //fprintf (stderr, "BEEP 1 BS RIGHT\n");
-+    //   beeper (opts, state, 1);
-+    //   state->dmr_end_alert[1] = 0; //new voice frame, okay to beep at the end of it
-+    // }
- 
-     memset(state->dmr_alias_block_segment[1], 0, sizeof(state->dmr_alias_block_segment[1]));
-     sprintf (state->dmr_embedded_gps[1], "%s", "");
-@@ -2297,8 +2300,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   if (opts->ncurses_compact == 1)
-   {
-     printw ("------------------------------------------------------------------------------\n");
--    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20231015)");
--    printw ("------------------------------------------------------------------------------\n");
-+    printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "AW (20240328)");
-+    printw ("------------------------------------------------------------------------------\n"); 
-   }
- #elif LIMAZULUTWEAKS
-   if (opts->ncurses_compact == 1)
-@@ -2335,13 +2338,13 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-       if (i == 4 && opts->frame_m17 == 1) printw (" CODEC2");
-       #endif
-       #ifdef AERO_BUILD
--      if (i == 5) printw (" %s ", "Aero Build");
--      if (i == 6) printw (" AW (20231015) \n");
-+      if (i == 5) printw (" %s ", "G Build");
-+      if (i == 6) printw (" AW (20240328) \n");
-       #elif ZDEV_BUILD
--      if (i == 5) printw (" %s ", "AW ");
-+      if (i == 5) printw (" %s ", "AW G Build");
-       if (i == 6) printw (" %s \n", GIT_TAG);
--      #else
--      if (i == 5) printw (" %s ", "AW ");
-+      #else 
-+      if (i == 5) printw (" %s ", "AW G Build");
-       if (i == 6) printw (" %s \n", GIT_TAG);
-       #endif
-       else printw ("\n");
-@@ -4151,7 +4154,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
-   if (c == 112) //'p' key - stop all per call wav files
-   {
-     //hope this one doesn't cause random crashing or garbage writing
--    closeWavOutFile (opts, state);
-+    // closeWavOutFile (opts, state);
-     closeWavOutFileL (opts, state);
-     closeWavOutFileR (opts, state);
-     sprintf (opts->wav_out_file, "%s", "");