diff --git a/wdsp/fir.cpp b/wdsp/fir.cpp
index b600721df..2ad6b1a22 100644
--- a/wdsp/fir.cpp
+++ b/wdsp/fir.cpp
@@ -35,8 +35,13 @@ float* FIR::fftcv_mults (int NM, float* c_impulse)
 {
     float* mults        = new float[NM * 2];
     float* cfft_impulse = new float[NM * 2];
-    fftwf_plan ptmp = fftwf_plan_dft_1d(NM, (fftwf_complex *) cfft_impulse,
-            (fftwf_complex *) mults, FFTW_FORWARD, FFTW_PATIENT);
+    fftwf_plan ptmp = fftwf_plan_dft_1d(
+        NM,
+        (fftwf_complex *) cfft_impulse,
+        (fftwf_complex *) mults,
+        FFTW_FORWARD,
+        FFTW_PATIENT
+    );
     std::fill(cfft_impulse, cfft_impulse + NM * 2, 0);
     // store complex coefs right-justified in the buffer
     std::copy(c_impulse, c_impulse + (NM / 2 + 1) * 2, &(cfft_impulse[NM - 2]));
@@ -93,7 +98,13 @@ float* FIR::fir_fsamp_odd (int N, float* A, int rtype, float scale, int wintype)
     float* window;
     float *fcoef     = new float[N * 2];
     float *c_impulse = new float[N * 2];
-    fftwf_plan ptmp = fftwf_plan_dft_1d(N, (fftwf_complex *)fcoef, (fftwf_complex *)c_impulse, FFTW_BACKWARD, FFTW_PATIENT);
+    fftwf_plan ptmp = fftwf_plan_dft_1d(
+        N,
+        (fftwf_complex *)fcoef,
+        (fftwf_complex *)c_impulse,
+        FFTW_BACKWARD,
+        FFTW_PATIENT
+    );
     float local_scale = 1.0 / (float)N;
     for (i = 0; i <= mid; i++)
     {
@@ -304,13 +315,23 @@ float *FIR::fir_read (int N, const char *filename, int rtype, float scale)
 void FIR::analytic (int N, float* in, float* out)
 {
     int i;
-    float inv_N = 1.0 / (float)N;
+    float inv_N = 1.0 / (float) N;
     float two_inv_N = 2.0 * inv_N;
     float* x = new float[N * 2]; // (float *) malloc0 (N * sizeof (complex));
-    fftwf_plan pfor = fftwf_plan_dft_1d (N, (fftwf_complex *) in,
-            (fftwf_complex *) x, FFTW_FORWARD, FFTW_PATIENT);
-    fftwf_plan prev = fftwf_plan_dft_1d (N, (fftwf_complex *) x,
-            (fftwf_complex *) out, FFTW_BACKWARD, FFTW_PATIENT);
+    fftwf_plan pfor = fftwf_plan_dft_1d (
+        N,
+        (fftwf_complex *) in,
+        (fftwf_complex *) x,
+        FFTW_FORWARD,
+        FFTW_PATIENT
+    );
+    fftwf_plan prev = fftwf_plan_dft_1d (
+        N,
+        (fftwf_complex *) x,
+        (fftwf_complex *) out,
+        FFTW_BACKWARD,
+        FFTW_PATIENT
+    );
     fftwf_execute (pfor);
     x[0] *= inv_N;
     x[1] *= inv_N;
@@ -332,23 +353,34 @@ void FIR::mp_imp (int N, float* fir, float* mpfir, int pfactor, int polarity)
 {
     int i;
     int size = N * pfactor;
-    float inv_PN = 1.0 / (float)size;
-    float* firpad  = new float[size * 2]; // (float *) malloc0 (size * sizeof (complex));
-    float* firfreq = new float[size * 2]; // (float *) malloc0 (size * sizeof (complex));
-    float* mag     = new float[size]; // (float *) malloc0 (size * sizeof (float));
-    float* ana     = new float[size * 2]; // (float *) malloc0 (size * sizeof (complex));
-    float* impulse = new float[size * 2]; // (float *) malloc0 (size * sizeof (complex));
-    float* newfreq = new float[size * 2]; // (float *) malloc0 (size * sizeof (complex));
+    double inv_PN = 1.0 / (float)size;
+    float* firpad   = new float[size * 2]; // (float *) malloc0 (size * sizeof (complex));
+    float* firfreq  = new float[size * 2]; // (float *) malloc0 (size * sizeof (complex));
+    double* mag     = new double[size]; // (float *) malloc0 (size * sizeof (float));
+    float* ana      = new float[size * 2]; // (float *) malloc0 (size * sizeof (complex));
+    float* impulse  = new float[size * 2]; // (float *) malloc0 (size * sizeof (complex));
+    float* newfreq  = new float[size * 2]; // (float *) malloc0 (size * sizeof (complex));
     std::copy(fir, fir + N * 2, firpad);
-    fftwf_plan pfor = fftwf_plan_dft_1d (size, (fftwf_complex *) firpad,
-            (fftwf_complex *) firfreq, FFTW_FORWARD, FFTW_PATIENT);
-    fftwf_plan prev = fftwf_plan_dft_1d (size, (fftwf_complex *) newfreq,
-            (fftwf_complex *) impulse, FFTW_BACKWARD, FFTW_PATIENT);
+    fftwf_plan pfor = fftwf_plan_dft_1d (
+        size,
+        (fftwf_complex *) firpad,
+        (fftwf_complex *) firfreq,
+        FFTW_FORWARD,
+        FFTW_PATIENT);
+    fftwf_plan prev = fftwf_plan_dft_1d (
+        size,
+        (fftwf_complex *) newfreq,
+        (fftwf_complex *) impulse,
+        FFTW_BACKWARD,
+        FFTW_PATIENT
+    );
     // print_impulse("orig_imp.txt", N, fir, 1, 0);
     fftwf_execute (pfor);
     for (i = 0; i < size; i++)
     {
-        mag[i] = sqrt (firfreq[2 * i + 0] * firfreq[2 * i + 0] + firfreq[2 * i + 1] * firfreq[2 * i + 1]) * inv_PN;
+        double xr = firfreq[2 * i + 0];
+        double xi = firfreq[2 * i + 1];
+        mag[i] = sqrt (xr*xr + xi*xi) * inv_PN;
         if (mag[i] > 0.0)
             ana[2 * i + 0] = log (mag[i]);
         else
diff --git a/wdsp/fir.hpp b/wdsp/fir.hpp
index 9e9f090c0..897dc31c2 100644
--- a/wdsp/fir.hpp
+++ b/wdsp/fir.hpp
@@ -38,13 +38,13 @@ public:
     static float* fir_fsamp_odd (int N, float* A, int rtype, float scale, int wintype);
     static float* fir_fsamp (int N, float* A, int rtype, float scale, int wintype);
     static float* fir_bandpass (int N, float f_low, float f_high, float samplerate, int wintype, int rtype, float scale);
-    static float* get_fsamp_window(int N, int wintype);
-    static float *fir_read (int N, const char *filename, int rtype, float scale);
     static void mp_imp (int N, float* fir, float* mpfir, int pfactor, int polarity);
-    static float* zff_impulse(int nc, float scale);
 
 private:
     static void analytic (int N, float* in, float* out);
+    static float* get_fsamp_window(int N, int wintype);
+    static float *fir_read (int N, const char *filename, int rtype, float scale);
+    static float* zff_impulse(int nc, float scale);
 };
 
 #endif
diff --git a/wdsp/fircore.cpp b/wdsp/fircore.cpp
index 6075eefb2..4907c362d 100644
--- a/wdsp/fircore.cpp
+++ b/wdsp/fircore.cpp
@@ -61,12 +61,30 @@ void FIRCORE::plan_fircore (FIRCORE *a)
         a->fftout[i]   = new float[2 * a->size * 2]; // (float *) malloc0 (2 * a->size * sizeof (complex));
         a->fmask[0][i] = new float[2 * a->size * 2]; // (float *) malloc0 (2 * a->size * sizeof (complex));
         a->fmask[1][i] = new float[2 * a->size * 2]; // (float *) malloc0 (2 * a->size * sizeof (complex));
-        a->pcfor[i] = fftwf_plan_dft_1d(2 * a->size, (fftwf_complex *)a->fftin, (fftwf_complex *)a->fftout[i], FFTW_FORWARD, FFTW_PATIENT);
-        a->maskplan[0][i] = fftwf_plan_dft_1d(2 * a->size, (fftwf_complex *)a->maskgen, (fftwf_complex *)a->fmask[0][i], FFTW_FORWARD, FFTW_PATIENT);
+        a->pcfor[i] = fftwf_plan_dft_1d(
+            2 * a->size,
+            (fftwf_complex *)a->fftin,
+            (fftwf_complex *)a->fftout[i],
+            FFTW_FORWARD,
+            FFTW_PATIENT
+        );
+        a->maskplan[0][i] = fftwf_plan_dft_1d(
+            2 * a->size,
+            (fftwf_complex *)a->maskgen,
+            (fftwf_complex *)a->fmask[0][i],
+            FFTW_FORWARD,
+            FFTW_PATIENT
+        );
         a->maskplan[1][i] = fftwf_plan_dft_1d(2 * a->size, (fftwf_complex *)a->maskgen, (fftwf_complex *)a->fmask[1][i], FFTW_FORWARD, FFTW_PATIENT);
     }
     a->accum = new float[2 * a->size * 2]; // (float *) malloc0 (2 * a->size * sizeof (complex));
-    a->crev = fftwf_plan_dft_1d(2 * a->size, (fftwf_complex *)a->accum, (fftwf_complex *)a->out, FFTW_BACKWARD, FFTW_PATIENT);
+    a->crev = fftwf_plan_dft_1d(
+        2 * a->size,
+        (fftwf_complex *)a->accum,
+        (fftwf_complex *)a->out,
+        FFTW_BACKWARD,
+        FFTW_PATIENT
+    );
     a->masks_ready = 0;
 }
 
diff --git a/wdsp/firopt.cpp b/wdsp/firopt.cpp
index 8b737654e..e466bf109 100644
--- a/wdsp/firopt.cpp
+++ b/wdsp/firopt.cpp
@@ -54,11 +54,29 @@ void FIROPT::plan_firopt (FIROPT *a)
     {
         a->fftout[i] = new float[2 * a->size * 2]; // (float *) malloc0 (2 * a->size * sizeof (complex));
         a->fmask[i] = new float[2 * a->size * 2]; //  (float *) malloc0 (2 * a->size * sizeof (complex));
-        a->pcfor[i] = fftwf_plan_dft_1d(2 * a->size, (fftwf_complex *)a->fftin, (fftwf_complex *)a->fftout[i], FFTW_FORWARD, FFTW_PATIENT);
-        a->maskplan[i] = fftwf_plan_dft_1d(2 * a->size, (fftwf_complex *)a->maskgen, (fftwf_complex *)a->fmask[i], FFTW_FORWARD, FFTW_PATIENT);
+        a->pcfor[i] = fftwf_plan_dft_1d(
+            2 * a->size,
+            (fftwf_complex *)a->fftin,
+            (fftwf_complex *)a->fftout[i],
+            FFTW_FORWARD,
+            FFTW_PATIENT
+        );
+        a->maskplan[i] = fftwf_plan_dft_1d(
+            2 * a->size,
+            (fftwf_complex *)a->maskgen,
+            (fftwf_complex *)a->fmask[i],
+            FFTW_FORWARD,
+            FFTW_PATIENT
+        );
     }
     a->accum = new float[2 * a->size * 2]; //  (float *) malloc0 (2 * a->size * sizeof (complex));
-    a->crev = fftwf_plan_dft_1d(2 * a->size, (fftwf_complex *)a->accum, (fftwf_complex *)a->out, FFTW_BACKWARD, FFTW_PATIENT);
+    a->crev = fftwf_plan_dft_1d(
+        2 * a->size,
+        (fftwf_complex *)a->accum,
+        (fftwf_complex *)a->out,
+        FFTW_BACKWARD,
+        FFTW_PATIENT
+    );
 }
 
 void FIROPT::calc_firopt (FIROPT *a)