diff --git a/peak_det_eval.grc b/peak_det_eval.grc
index 475b2f0..5a65852 100644
--- a/peak_det_eval.grc
+++ b/peak_det_eval.grc
@@ -143,6 +143,33 @@
       <value>1024</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>(24, 572)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>am_bandwidth</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>2500</value>
+    </param>
+  </block>
   <block>
     <key>variable</key>
     <param>
@@ -275,7 +302,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>8e6</value>
+      <value>16e6</value>
     </param>
   </block>
   <block>
@@ -463,7 +490,7 @@
     </param>
     <param>
       <key>cutoff_freq</key>
-      <value>audio_rate/4</value>
+      <value>am_bandwidth</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -491,7 +518,7 @@
     </param>
     <param>
       <key>width</key>
-      <value>audio_rate/4/10</value>
+      <value>am_bandwidth/10</value>
     </param>
     <param>
       <key>win</key>
@@ -565,7 +592,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1216, 148)</value>
+      <value>(1048, 164)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1802,7 +1829,7 @@
     </param>
     <param>
       <key>length</key>
-      <value>32</value>
+      <value>64</value>
     </param>
     <param>
       <key>long_form</key>
@@ -2081,7 +2108,7 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>1</value>
+      <value>0</value>
     </param>
     <param>
       <key>_coordinate</key>
@@ -2321,11 +2348,11 @@
     </param>
     <param>
       <key>peak_width_max</key>
-      <value>2500</value>
+      <value>2*am_bandwidth</value>
     </param>
     <param>
       <key>peak_width_min</key>
-      <value>2000</value>
+      <value>am_bandwidth</value>
     </param>
     <param>
       <key>peak_hysteresis</key>
@@ -2430,7 +2457,7 @@
     <key>jay_squelch</key>
     <param>
       <key>alpha</key>
-      <value>0.01</value>
+      <value>0.002</value>
     </param>
     <param>
       <key>alias</key>
@@ -2450,7 +2477,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1064, 160)</value>
+      <value>(1224, 160)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2800,7 +2827,7 @@
     </param>
     <param>
       <key>entags</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -3167,7 +3194,7 @@
     </param>
     <param>
       <key>entags</key>
-      <value>True</value>
+      <value>False</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -5045,7 +5072,7 @@
     </param>
     <param>
       <key>hide_cmd_port</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
       <key>hide_lo_controls</key>
@@ -5070,7 +5097,7 @@
   </block>
   <connection>
     <source_block_id>analog_agc_xx_0</source_block_id>
-    <sink_block_id>audio_sink_0</sink_block_id>
+    <sink_block_id>jay_squelch_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -5220,7 +5247,7 @@
   </connection>
   <connection>
     <source_block_id>dc_blocker_xx_0</source_block_id>
-    <sink_block_id>jay_squelch_0</sink_block_id>
+    <sink_block_id>analog_agc_xx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -5266,12 +5293,6 @@
     <source_key>out</source_key>
     <sink_key>control</sink_key>
   </connection>
-  <connection>
-    <source_block_id>jay_message_filter_0</source_block_id>
-    <sink_block_id>qtgui_freq_sink_x_0</sink_block_id>
-    <source_key>out</source_key>
-    <sink_key>freq</sink_key>
-  </connection>
   <connection>
     <source_block_id>jay_message_filter_0_0</source_block_id>
     <sink_block_id>freq_xlating_fir_filter_xxx_0_0</sink_block_id>
@@ -5334,7 +5355,7 @@
   </connection>
   <connection>
     <source_block_id>jay_squelch_0</source_block_id>
-    <sink_block_id>analog_agc_xx_0</sink_block_id>
+    <sink_block_id>audio_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>