diff --git a/fancy_rx.grc b/fancy_rx.grc
index e2c072d..9547670 100644
--- a/fancy_rx.grc
+++ b/fancy_rx.grc
@@ -89,6 +89,60 @@
       <value>(0,0)</value>
     </param>
   </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1040, 28)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>FRAME_RATE</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>10</value>
+    </param>
+  </block>
+  <block>
+    <key>variable</key>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(936, 28)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>N_FFT</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>1024</value>
+    </param>
+  </block>
   <block>
     <key>variable_chooser</key>
     <param>
@@ -274,7 +328,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>4</value>
+      <value>0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -392,7 +446,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>3</value>
+      <value>9</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -510,7 +564,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>3</value>
+      <value>0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -906,62 +960,7 @@
     </param>
     <param>
       <key>vlen</key>
-      <value>1024</value>
-    </param>
-  </block>
-  <block>
-    <key>blocks_max_xx</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(968, 452)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>blocks_max_xx_0</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1024</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>vlen_out</key>
-      <value>1024</value>
+      <value>N_FFT</value>
     </param>
   </block>
   <block>
@@ -984,7 +983,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(320, 584)</value>
+      <value>(288, 608)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1035,7 +1034,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(784, 452)</value>
+      <value>(984, 308)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1055,7 +1054,7 @@
     </param>
     <param>
       <key>vlen</key>
-      <value>1024</value>
+      <value>N_FFT</value>
     </param>
     <param>
       <key>k</key>
@@ -1086,7 +1085,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(552, 428)</value>
+      <value>(600, 428)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1114,15 +1113,15 @@
     </param>
     <param>
       <key>vlen</key>
-      <value>1024</value>
+      <value>N_FFT</value>
     </param>
     <param>
       <key>vec_rate</key>
-      <value>30</value>
+      <value>FRAME_RATE</value>
     </param>
   </block>
   <block>
-    <key>blocks_vector_to_stream</key>
+    <key>blocks_tag_gate</key>
     <param>
       <key>alias</key>
       <value></value>
@@ -1141,7 +1140,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(992, 612)</value>
+      <value>(448, 436)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1149,11 +1148,11 @@
     </param>
     <param>
       <key>id</key>
-      <value>blocks_vector_to_stream_0</value>
+      <value>blocks_tag_gate_0</value>
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>complex</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -1164,8 +1163,12 @@
       <value>0</value>
     </param>
     <param>
-      <key>num_items</key>
-      <value>1024</value>
+      <key>propagate_tags</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>single_key</key>
+      <value>""</value>
     </param>
     <param>
       <key>vlen</key>
@@ -1192,7 +1195,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1208, 364)</value>
+      <value>(1168, 620)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1216,7 +1219,58 @@
     </param>
     <param>
       <key>num_items</key>
-      <value>1024</value>
+      <value>N_FFT</value>
+    </param>
+    <param>
+      <key>vlen</key>
+      <value>1</value>
+    </param>
+  </block>
+  <block>
+    <key>blocks_vector_to_stream</key>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1168, 668)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>blocks_vector_to_stream_0_0_0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>float</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>num_items</key>
+      <value>N_FFT</value>
     </param>
     <param>
       <key>vlen</key>
@@ -1243,7 +1297,7 @@
     </param>
     <param>
       <key>fft_size</key>
-      <value>1024</value>
+      <value>N_FFT</value>
     </param>
     <param>
       <key>forward</key>
@@ -1310,7 +1364,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(320, 500)</value>
+      <value>(296, 508)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1345,11 +1399,11 @@
     <key>jay_peak_detect</key>
     <param>
       <key>alpha_m</key>
-      <value>0.01</value>
+      <value>0.04</value>
     </param>
     <param>
       <key>alpha_s</key>
-      <value>0.9</value>
+      <value>0.4</value>
     </param>
     <param>
       <key>alias</key>
@@ -1367,9 +1421,13 @@
       <key>_enabled</key>
       <value>True</value>
     </param>
+    <param>
+      <key>framerate</key>
+      <value>FRAME_RATE</value>
+    </param>
     <param>
       <key>_coordinate</key>
-      <value>(808, 596)</value>
+      <value>(880, 588)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1387,9 +1445,21 @@
       <key>minoutbuf</key>
       <value>0</value>
     </param>
+    <param>
+      <key>peak_height_min</key>
+      <value>20</value>
+    </param>
+    <param>
+      <key>peak_width_max</key>
+      <value>37</value>
+    </param>
+    <param>
+      <key>peak_width_min</key>
+      <value>5</value>
+    </param>
     <param>
       <key>vlen</key>
-      <value>1024</value>
+      <value>N_FFT</value>
     </param>
   </block>
   <block>
@@ -2619,7 +2689,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(64, 484)</value>
+      <value>(0, 452)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2802,11 +2872,11 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>0</value>
     </param>
     <param>
       <key>fft_size</key>
-      <value>1024</value>
+      <value>N_FFT</value>
     </param>
     <param>
       <key>freqvar</key>
@@ -2814,7 +2884,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(568, 516)</value>
+      <value>(560, 540)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2846,7 +2916,7 @@
     </param>
     <param>
       <key>fft_rate</key>
-      <value>15</value>
+      <value>FRAME_RATE</value>
     </param>
     <param>
       <key>samp_rate</key>
@@ -2905,11 +2975,11 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>1</value>
+      <value>0</value>
     </param>
     <param>
       <key>fft_size</key>
-      <value>1024</value>
+      <value>N_FFT</value>
     </param>
     <param>
       <key>freqvar</key>
@@ -2917,7 +2987,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(320, 292)</value>
+      <value>(264, 292)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -3004,7 +3074,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1264, 492)</value>
+      <value>(1368, 620)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -3028,11 +3098,11 @@
     </param>
     <param>
       <key>samp_rate</key>
-      <value>30</value>
+      <value>FRAME_RATE*N_FFT</value>
     </param>
     <param>
       <key>t_scale</key>
-      <value>0</value>
+      <value>.1/FRAME_RATE</value>
     </param>
     <param>
       <key>title</key>
@@ -3040,7 +3110,7 @@
     </param>
     <param>
       <key>trig_mode</key>
-      <value>wxgui.TRIG_MODE_AUTO</value>
+      <value>wxgui.TRIG_MODE_STRIPCHART</value>
     </param>
     <param>
       <key>type</key>
@@ -3079,15 +3149,9 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>blocks_max_xx_0</source_block_id>
-    <sink_block_id>blocks_vector_to_stream_0_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>blocks_multiply_xx_0</source_block_id>
-    <sink_block_id>blocks_stream_to_vector_decimator_0</sink_block_id>
+    <sink_block_id>blocks_tag_gate_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -3097,12 +3161,6 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>blocks_nlog10_ff_0</source_block_id>
-    <sink_block_id>blocks_max_xx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>blocks_nlog10_ff_0</source_block_id>
     <sink_block_id>jay_peak_detect_0</sink_block_id>
@@ -3116,10 +3174,10 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_vector_to_stream_0</source_block_id>
-    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_block_id>blocks_tag_gate_0</source_block_id>
+    <sink_block_id>blocks_stream_to_vector_decimator_0</sink_block_id>
     <source_key>0</source_key>
-    <sink_key>1</sink_key>
+    <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>blocks_vector_to_stream_0_0</source_block_id>
@@ -3127,6 +3185,12 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>blocks_vector_to_stream_0_0_0</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>1</sink_key>
+  </connection>
   <connection>
     <source_block_id>fft_vxx_0</source_block_id>
     <sink_block_id>blocks_complex_to_mag_squared_0</sink_block_id>
@@ -3135,10 +3199,16 @@
   </connection>
   <connection>
     <source_block_id>jay_peak_detect_0</source_block_id>
-    <sink_block_id>blocks_vector_to_stream_0</sink_block_id>
+    <sink_block_id>blocks_vector_to_stream_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>jay_peak_detect_0</source_block_id>
+    <sink_block_id>blocks_vector_to_stream_0_0_0</sink_block_id>
+    <source_key>1</source_key>
+    <sink_key>0</sink_key>
+  </connection>
   <connection>
     <source_block_id>uhd_usrp_source_0</source_block_id>
     <sink_block_id>blocks_multiply_xx_0</sink_block_id>