diff --git a/src/dsd_main.c b/src/dsd_main.c
index a8baa4a..ebd9b2e 100644
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
@@ -1520,7 +1520,7 @@ main (int argc, char **argv)
               opts.dmr_stereo = 0;
               opts.dmr_mono = 1;
               state.dmr_stereo = 0;
-              opts.setmod_bw = 7000;
+              // opts.setmod_bw = 7000;
               sprintf (opts.output_name, "Legacy Auto");
             }
           else if (optarg[0] == 'd')
@@ -1614,7 +1614,7 @@ main (int argc, char **argv)
               opts.dmr_mono = 0;
               opts.pulse_digi_rate_out = 48000;
               opts.pulse_digi_out_channels = 1;
-              opts.setmod_bw = 7000;
+              opts.setmod_bw = 12000;
               sprintf (opts.output_name, "P25P1");
               fprintf (stderr,"Decoding only P25 Phase 1 frames.\n");
             }
@@ -1641,7 +1641,7 @@ main (int argc, char **argv)
               opts.dmr_stereo = 0;
               state.dmr_stereo = 0;
               opts.dmr_mono = 0;
-              opts.setmod_bw = 4000;
+              // opts.setmod_bw = 4000; //causing issues
               sprintf (opts.output_name, "NXDN48");
               fprintf (stderr,"Setting symbol rate to 2400 / second\n");
               fprintf (stderr,"Decoding only NXDN 4800 baud frames.\n");
@@ -1695,7 +1695,7 @@ main (int argc, char **argv)
                   opts.dmr_stereo = 1;
                   state.dmr_stereo = 0;
                   opts.dmr_mono = 0;
-                  opts.setmod_bw = 7000;
+                  opts.setmod_bw = 12000;
                   sprintf (opts.output_name, "P25P2");
                   fprintf (stderr,"Decoding P25-P2 frames C4FM or OP25 Symbol Captures!\n");
                   }
@@ -1718,7 +1718,6 @@ main (int argc, char **argv)
                 state.rf_mod = 0;
                 opts.dmr_stereo = 1;
                 opts.dmr_mono = 0;
-                // opts.setmod_bw = 7000;
                 opts.setmod_bw = 7000;
                 opts.pulse_digi_rate_out = 24000;
                 opts.pulse_digi_out_channels = 2;
@@ -1746,7 +1745,7 @@ main (int argc, char **argv)
                       state.rf_mod = 0;
                       opts.dmr_stereo = 1;
                       opts.dmr_mono = 0;
-                      opts.setmod_bw = 7000;
+                      opts.setmod_bw = 12000; //safe default on both DMR and P25
                       opts.pulse_digi_rate_out = 24000;
                       opts.pulse_digi_out_channels = 2;
                       sprintf (opts.output_name, "XDMA");
@@ -1773,7 +1772,7 @@ main (int argc, char **argv)
               opts.dmr_stereo = 0;
               opts.dmr_mono = 0;
               state.dmr_stereo = 0;
-              opts.setmod_bw = 7000;
+              // opts.setmod_bw = 7000; //causing issues
               sprintf (opts.output_name, "NXDN96");
               fprintf (stderr,"Decoding only NXDN 9600 baud frames.\n");
             }
@@ -1884,8 +1883,8 @@ main (int argc, char **argv)
               opts.mod_qpsk = 0;
               opts.mod_gfsk = 0;
               state.rf_mod = 0;
-              state.samplesPerSymbol = 8; 
-              state.symbolCenter = 3; 
+              state.samplesPerSymbol = 10; 
+              state.symbolCenter = 4; 
               opts.setmod_bw = 12000;
               fprintf (stderr,"Enabling 6000 sps P25p2 C4FM.\n");
             }