diff --git a/peak_det_eval.grc b/peak_det_eval.grc
index d662ad9..38d973c 100644
--- a/peak_det_eval.grc
+++ b/peak_det_eval.grc
@@ -349,7 +349,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>0.1</value>
+      <value>-30</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -357,7 +357,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(0, 796)</value>
+      <value>(1416, 972)</value>
     </param>
     <param>
       <key>gui_hint</key>
@@ -385,15 +385,15 @@
     </param>
     <param>
       <key>start</key>
-      <value>0</value>
+      <value>-90</value>
     </param>
     <param>
       <key>step</key>
-      <value>0.01</value>
+      <value>10</value>
     </param>
     <param>
       <key>stop</key>
-      <value>1.0</value>
+      <value>0</value>
     </param>
     <param>
       <key>rangeType</key>
@@ -420,7 +420,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(160, 796)</value>
+      <value>(1416, 836)</value>
     </param>
     <param>
       <key>gui_hint</key>
@@ -479,7 +479,7 @@
     </param>
     <param>
       <key>cutoff_freq</key>
-      <value>channel_rate</value>
+      <value>channel_rate/2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -507,7 +507,7 @@
     </param>
     <param>
       <key>width</key>
-      <value>channel_rate/10</value>
+      <value>channel_rate/2/10</value>
     </param>
     <param>
       <key>win</key>
@@ -554,7 +554,7 @@
     </param>
     <param>
       <key>width</key>
-      <value>am_bandwidth/10</value>
+      <value>am_bandwidth/2/5</value>
     </param>
     <param>
       <key>win</key>
@@ -577,7 +577,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1184, 388)</value>
+      <value>(0, 764)</value>
     </param>
     <param>
       <key>gui_hint</key>
@@ -680,7 +680,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(640, 540)</value>
+      <value>(1368, 684)</value>
     </param>
     <param>
       <key>gui_hint</key>
@@ -708,7 +708,11 @@
     </param>
   </block>
   <block>
-    <key>analog_agc_xx</key>
+    <key>analog_agc2_xx</key>
+    <param>
+      <key>attack_rate</key>
+      <value>1e-2</value>
+    </param>
     <param>
       <key>alias</key>
       <value></value>
@@ -721,13 +725,17 @@
       <key>affinity</key>
       <value></value>
     </param>
+    <param>
+      <key>decay_rate</key>
+      <value>1e-2</value>
+    </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1048, 164)</value>
+      <value>(1048, 156)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -739,11 +747,11 @@
     </param>
     <param>
       <key>id</key>
-      <value>analog_agc_xx_0</value>
+      <value>analog_agc2_xx_0</value>
     </param>
     <param>
       <key>max_gain</key>
-      <value>10</value>
+      <value>20</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -753,13 +761,9 @@
       <key>minoutbuf</key>
       <value>0</value>
     </param>
-    <param>
-      <key>rate</key>
-      <value>1e-2</value>
-    </param>
     <param>
       <key>reference</key>
-      <value>0.8</value>
+      <value>1.0</value>
     </param>
     <param>
       <key>type</key>
@@ -767,7 +771,11 @@
     </param>
   </block>
   <block>
-    <key>analog_agc_xx</key>
+    <key>analog_agc2_xx</key>
+    <param>
+      <key>attack_rate</key>
+      <value>0.01</value>
+    </param>
     <param>
       <key>alias</key>
       <value></value>
@@ -780,13 +788,17 @@
       <key>affinity</key>
       <value></value>
     </param>
+    <param>
+      <key>decay_rate</key>
+      <value>1e-2</value>
+    </param>
     <param>
       <key>_enabled</key>
       <value>True</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(552, 164)</value>
+      <value>(528, 156)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -794,11 +806,11 @@
     </param>
     <param>
       <key>gain</key>
-      <value>1.0</value>
+      <value>0.1</value>
     </param>
     <param>
       <key>id</key>
-      <value>analog_agc_xx_1</value>
+      <value>analog_agc2_xx_1</value>
     </param>
     <param>
       <key>max_gain</key>
@@ -812,13 +824,9 @@
       <key>minoutbuf</key>
       <value>0</value>
     </param>
-    <param>
-      <key>rate</key>
-      <value>1e-2</value>
-    </param>
     <param>
       <key>reference</key>
-      <value>0.05</value>
+      <value>0.1</value>
     </param>
     <param>
       <key>type</key>
@@ -1002,7 +1010,7 @@
     <key>analog_sig_source_x</key>
     <param>
       <key>amp</key>
-      <value>variable_amp_2*variable_test_tone_scale</value>
+      <value>10**(variable_amp_2/20)*variable_test_tone_scale</value>
     </param>
     <param>
       <key>alias</key>
@@ -2298,7 +2306,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(664, 412)</value>
+      <value>(776, 412)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2558,7 +2566,7 @@
     </param>
     <param>
       <key>peak_width_min</key>
-      <value>am_bandwidth</value>
+      <value>am_bandwidth/2</value>
     </param>
     <param>
       <key>peak_hysteresis</key>
@@ -2644,7 +2652,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(664, 496)</value>
+      <value>(824, 484)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2714,53 +2722,6 @@
       <value>0</value>
     </param>
   </block>
-  <block>
-    <key>parameter</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(432, 600)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>parameter_0</value>
-    </param>
-    <param>
-      <key>label</key>
-      <value></value>
-    </param>
-    <param>
-      <key>short_id</key>
-      <value></value>
-    </param>
-    <param>
-      <key>hide</key>
-      <value>none</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value></value>
-    </param>
-    <param>
-      <key>value</key>
-      <value>0</value>
-    </param>
-  </block>
   <block>
     <key>qtgui_freq_sink_x</key>
     <param>
@@ -2769,7 +2730,7 @@
     </param>
     <param>
       <key>average</key>
-      <value>0.2</value>
+      <value>1.0</value>
     </param>
     <param>
       <key>axislabels</key>
@@ -5357,19 +5318,19 @@
     </param>
   </block>
   <connection>
-    <source_block_id>analog_agc_xx_0</source_block_id>
+    <source_block_id>analog_agc2_xx_0</source_block_id>
     <sink_block_id>jay_squelch_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>analog_agc_xx_1</source_block_id>
+    <source_block_id>analog_agc2_xx_1</source_block_id>
     <sink_block_id>analog_am_demod_cf_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>analog_agc_xx_1</source_block_id>
+    <source_block_id>analog_agc2_xx_1</source_block_id>
     <sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
@@ -5508,7 +5469,7 @@
   </connection>
   <connection>
     <source_block_id>dc_blocker_xx_0</source_block_id>
-    <sink_block_id>analog_agc_xx_0</sink_block_id>
+    <sink_block_id>analog_agc2_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -5538,7 +5499,7 @@
   </connection>
   <connection>
     <source_block_id>freq_xlating_fir_filter_xxx_0_0</source_block_id>
-    <sink_block_id>analog_agc_xx_1</sink_block_id>
+    <sink_block_id>analog_agc2_xx_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>