diff --git a/examples/wifi_loopback.grc b/examples/wifi_loopback.grc
index 67ca3a9..83e4227 100644
--- a/examples/wifi_loopback.grc
+++ b/examples/wifi_loopback.grc
@@ -85,7 +85,7 @@
     <key>variable_chooser</key>
     <param>
       <key>choices</key>
-      <value>[0, 1]</value>
+      <value>[ieee802_11.LS, ieee802_11.LMS, ieee802_11.STA, ieee802_11.COMB]</value>
     </param>
     <param>
       <key>comment</key>
@@ -93,7 +93,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>1</value>
+      <value>ieee802_11.LS</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -101,7 +101,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(176, 7)</value>
+      <value>(184, 8)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -121,7 +121,7 @@
     </param>
     <param>
       <key>labels</key>
-      <value>["LMS", "Linear Comb"]</value>
+      <value>["LS", "LMS", "STA", "Linear Comb"]</value>
     </param>
     <param>
       <key>notebook</key>
@@ -148,7 +148,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>0</value>
+      <value>5</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -156,7 +156,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(448, 8)</value>
+      <value>(488, 9)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -199,11 +199,11 @@
     </param>
     <param>
       <key>converver</key>
-      <value>int_converter</value>
+      <value>float_converter</value>
     </param>
     <param>
       <key>value</key>
-      <value>100</value>
+      <value>10e-6</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -211,7 +211,66 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(752, 8)</value>
+      <value>(984, 17)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>epsilon</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value></value>
+    </param>
+    <param>
+      <key>max</key>
+      <value>20e-6</value>
+    </param>
+    <param>
+      <key>min</key>
+      <value>-20e-6</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>num_steps</key>
+      <value>1000</value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.SL_HORIZONTAL</value>
+    </param>
+  </block>
+  <block>
+    <key>variable_slider</key>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>converver</key>
+      <value>int_converter</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>200</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(792, 9)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -289,7 +348,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>500</value>
+      <value>400</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -297,7 +356,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(632, 7)</value>
+      <value>(664, 8)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -356,7 +415,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(336, 7)</value>
+      <value>(368, 8)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -423,7 +482,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(64, 277)</value>
+      <value>(144, 259)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -466,7 +525,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(296, 181)</value>
+      <value>(488, 171)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -517,7 +576,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(672, 600)</value>
+      <value>(736, 740)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -564,7 +623,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(48, 520)</value>
+      <value>(124, 448)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -591,6 +650,53 @@
       <value>0</value>
     </param>
   </block>
+  <block>
+    <key>blocks_pdu_to_tagged_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>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(512, 404)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>180</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>blocks_pdu_to_tagged_stream_0_0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>tag</key>
+      <value>packet_len</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+  </block>
   <block>
     <key>channels_channel_model</key>
     <param>
@@ -611,7 +717,7 @@
     </param>
     <param>
       <key>_enabled</key>
-      <value>True</value>
+      <value>1</value>
     </param>
     <param>
       <key>epsilon</key>
@@ -619,11 +725,11 @@
     </param>
     <param>
       <key>freq_offset</key>
-      <value>0</value>
+      <value>epsilon * 5.89e9 / 10e6</value>
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(848, 575)</value>
+      <value>(904, 712)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -686,7 +792,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(504, 575)</value>
+      <value>(560, 712)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -737,7 +843,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(272, 285)</value>
+      <value>(352, 267)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -788,7 +894,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(584, 184)</value>
+      <value>(736, 179)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -835,7 +941,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(112, 381)</value>
+      <value>(288, 364)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -858,6 +964,69 @@
       <value>0</value>
     </param>
   </block>
+  <block>
+    <key>pfb_arb_resampler_xxx</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>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1063, 480)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>90</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>pfb_arb_resampler_xxx_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>nfilts</key>
+      <value>32</value>
+    </param>
+    <param>
+      <key>rrate</key>
+      <value>1+epsilon</value>
+    </param>
+    <param>
+      <key>samp_delay</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>atten</key>
+      <value>100</value>
+    </param>
+    <param>
+      <key>taps</key>
+      <value></value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>ccf</value>
+    </param>
+  </block>
   <block>
     <key>wifi_phy_hier</key>
     <param>
@@ -878,7 +1047,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(624, 368)</value>
+      <value>(792, 376)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -896,6 +1065,10 @@
       <key>minoutbuf</key>
       <value>0</value>
     </param>
+    <param>
+      <key>bandwidth</key>
+      <value>10e6</value>
+    </param>
     <param>
       <key>chan_est</key>
       <value>chan_est</value>
@@ -904,6 +1077,10 @@
       <key>encoding</key>
       <value>encoding</value>
     </param>
+    <param>
+      <key>frequency</key>
+      <value>5.89e9</value>
+    </param>
     <param>
       <key>sensitivity</key>
       <value>0.56</value>
@@ -945,7 +1122,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(184, 627)</value>
+      <value>(224, 558)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1032,11 +1209,11 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(336, 391)</value>
+      <value>(408, 568)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>270</value>
     </param>
     <param>
       <key>grid_pos</key>
@@ -1113,9 +1290,15 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>blocks_pdu_to_tagged_stream_0_0</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
   <connection>
     <source_block_id>channels_channel_model_0</source_block_id>
-    <sink_block_id>wifi_phy_hier_0</sink_block_id>
+    <sink_block_id>pfb_arb_resampler_xxx_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -1144,11 +1327,17 @@
     <sink_key>pdus</sink_key>
   </connection>
   <connection>
-    <source_block_id>wifi_phy_hier_0</source_block_id>
-    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
-    <source_key>1</source_key>
+    <source_block_id>pfb_arb_resampler_xxx_0</source_block_id>
+    <sink_block_id>wifi_phy_hier_0</sink_block_id>
+    <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>wifi_phy_hier_0</source_block_id>
+    <sink_block_id>blocks_pdu_to_tagged_stream_0_0</sink_block_id>
+    <source_key>carrier</source_key>
+    <sink_key>pdus</sink_key>
+  </connection>
   <connection>
     <source_block_id>wifi_phy_hier_0</source_block_id>
     <sink_block_id>foo_wireshark_connector_0</sink_block_id>
diff --git a/examples/wifi_phy_hier.grc b/examples/wifi_phy_hier.grc
index da44148..3baa002 100644
--- a/examples/wifi_phy_hier.grc
+++ b/examples/wifi_phy_hier.grc
@@ -120,7 +120,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(560, 13)</value>
+      <value>(528, 19)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -128,11 +128,11 @@
     </param>
     <param>
       <key>id</key>
-      <value>out_buf_size</value>
+      <value>max_symbols</value>
     </param>
     <param>
       <key>value</key>
-      <value>96000</value>
+      <value>5 + 1 + ((16 + 1540 * 8 + 6) * 2) / 24</value>
     </param>
   </block>
   <block>
@@ -189,6 +189,49 @@
       <value>48</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>(1008, 14)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>bandwidth</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value></value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>10e6</value>
+    </param>
+  </block>
   <block>
     <key>blocks_complex_to_mag</key>
     <param>
@@ -209,7 +252,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(976, 576)</value>
+      <value>(960, 585)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -252,7 +295,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(600, 496)</value>
+      <value>(600, 505)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -295,7 +338,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(376, 600)</value>
+      <value>(384, 601)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -338,7 +381,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(424, 792)</value>
+      <value>(432, 771)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -393,7 +436,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(224, 600)</value>
+      <value>(224, 595)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -495,7 +538,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(608, 552)</value>
+      <value>(608, 569)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -546,7 +589,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(912, 768)</value>
+      <value>(904, 755)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -597,7 +640,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(760, 240)</value>
+      <value>(744, 257)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -621,7 +664,7 @@
     </param>
     <param>
       <key>minoutbuf</key>
-      <value>out_buf_size</value>
+      <value>max_symbols * 48 * 8</value>
     </param>
     <param>
       <key>ninputs</key>
@@ -636,57 +679,6 @@
       <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>(312, 867)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>blocks_vector_to_stream_0</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>num_items</key>
-      <value>48</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-  </block>
   <block>
     <key>parameter</key>
     <param>
@@ -703,7 +695,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(664, 13)</value>
+      <value>(640, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -727,7 +719,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>0</value>
+      <value>ieee802_11.LS</value>
     </param>
   </block>
   <block>
@@ -754,7 +746,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(504, 189)</value>
+      <value>(504, 203)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -813,7 +805,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1008, 232)</value>
+      <value>(1040, 227)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -833,7 +825,7 @@
     </param>
     <param>
       <key>minoutbuf</key>
-      <value>out_buf_size</value>
+      <value>max_symbols * 48 * 8</value>
     </param>
     <param>
       <key>occupied_carriers</key>
@@ -880,7 +872,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(736, 373)</value>
+      <value>(752, 379)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -900,7 +892,7 @@
     </param>
     <param>
       <key>minoutbuf</key>
-      <value>out_buf_size</value>
+      <value>max_symbols * 48 * 8</value>
     </param>
     <param>
       <key>rolloff</key>
@@ -931,7 +923,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(232, 189)</value>
+      <value>(240, 203)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -970,7 +962,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(752, 13)</value>
+      <value>(728, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1025,7 +1017,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1008, 359)</value>
+      <value>(1040, 363)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1045,7 +1037,7 @@
     </param>
     <param>
       <key>minoutbuf</key>
-      <value>out_buf_size</value>
+      <value>max_symbols * 48 * 8</value>
     </param>
     <param>
       <key>nthreads</key>
@@ -1088,7 +1080,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1008, 911)</value>
+      <value>(992, 896)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1123,6 +1115,49 @@
       <value>window.rectangular(64)</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>(920, 14)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>frequency</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value></value>
+    </param>
+    <param>
+      <key>short_id</key>
+      <value></value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>eng_float</value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>5.89e9</value>
+    </param>
+  </block>
   <block>
     <key>ieee802_11_chunks_to_symbols_xx</key>
     <param>
@@ -1143,7 +1178,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(496, 288)</value>
+      <value>(496, 289)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1159,7 +1194,160 @@
     </param>
     <param>
       <key>minoutbuf</key>
-      <value>out_buf_size</value>
+      <value>max_symbols * 48 * 8</value>
+    </param>
+  </block>
+  <block>
+    <key>ieee802_11_decode_mac</key>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>debug</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(488, 932)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>180</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>ieee802_11_decode_mac_0</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>ieee802_11_frame_equalizer</key>
+    <param>
+      <key>algo</key>
+      <value>chan_est</value>
+    </param>
+    <param>
+      <key>bw</key>
+      <value>bandwidth</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>debug</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>freq</key>
+      <value>frequency</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(776, 896)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>180</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>ieee802_11_frame_equalizer_0</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>ieee802_11_mapper</key>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>debug</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>encoding</key>
+      <value>encoding</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(208, 107)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>180</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>ieee802_11_mapper_0</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
     </param>
   </block>
   <block>
@@ -1182,7 +1370,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(832, 496)</value>
+      <value>(848, 499)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1229,7 +1417,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(744, 576)</value>
+      <value>(752, 579)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1256,194 +1444,6 @@
       <value>complex</value>
     </param>
   </block>
-  <block>
-    <key>ieee802_11_decode_mac</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>debug</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(312, 933)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>ieee802_11_decode_mac_0</value>
-    </param>
-    <param>
-      <key>log</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>ieee802_11_decode_signal</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>debug</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(536, 933)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>ieee802_11_decode_signal_0</value>
-    </param>
-    <param>
-      <key>log</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>ieee802_11_equalize_symbols</key>
-    <param>
-      <key>algo</key>
-      <value>chan_est</value>
-    </param>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>debug</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(752, 933)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>ieee802_11_equalize_symbols_0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>ieee802_11_mapper</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>debug</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>encoding</key>
-      <value>encoding</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(200, 109)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>ieee802_11_mapper_0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-  </block>
   <block>
     <key>pad_sink</key>
     <param>
@@ -1456,7 +1456,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(528, 384)</value>
+      <value>(568, 395)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1499,7 +1499,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(176, 867)</value>
+      <value>(512, 876)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1511,7 +1511,7 @@
     </param>
     <param>
       <key>type</key>
-      <value>complex</value>
+      <value>message</value>
     </param>
     <param>
       <key>label</key>
@@ -1523,7 +1523,7 @@
     </param>
     <param>
       <key>optional</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
       <key>vlen</key>
@@ -1542,7 +1542,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(112, 936)</value>
+      <value>(312, 940)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1585,7 +1585,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(56, 496)</value>
+      <value>(64, 499)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1628,7 +1628,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(416, 112)</value>
+      <value>(424, 115)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1675,7 +1675,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(840, 13)</value>
+      <value>(824, 11)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1726,7 +1726,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(608, 744)</value>
+      <value>(640, 739)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1777,7 +1777,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(128, 696)</value>
+      <value>(128, 713)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1868,12 +1868,6 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>blocks_vector_to_stream_0</source_block_id>
-    <sink_block_id>pad_sink_1</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>digital_chunks_to_symbols_xx_0</source_block_id>
     <sink_block_id>blocks_tagged_stream_mux_0</sink_block_id>
@@ -1906,7 +1900,7 @@
   </connection>
   <connection>
     <source_block_id>fft_vxx_0_1</source_block_id>
-    <sink_block_id>ieee802_11_equalize_symbols_0</sink_block_id>
+    <sink_block_id>ieee802_11_frame_equalizer_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -1916,6 +1910,36 @@
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
+  <connection>
+    <source_block_id>ieee802_11_decode_mac_0</source_block_id>
+    <sink_block_id>pad_sink_2</sink_block_id>
+    <source_key>out</source_key>
+    <sink_key>in</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>ieee802_11_frame_equalizer_0</source_block_id>
+    <sink_block_id>ieee802_11_decode_mac_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>ieee802_11_frame_equalizer_0</source_block_id>
+    <sink_block_id>pad_sink_1</sink_block_id>
+    <source_key>symbols</source_key>
+    <sink_key>in</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>ieee802_11_mapper_0</source_block_id>
+    <sink_block_id>digital_packet_headergenerator_bb_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>ieee802_11_mapper_0</source_block_id>
+    <sink_block_id>ieee802_11_chunks_to_symbols_xx_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
   <connection>
     <source_block_id>ieee802_11_moving_average_xx_0</source_block_id>
     <sink_block_id>blocks_divide_xx_0</sink_block_id>
@@ -1934,42 +1958,6 @@
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
-  <connection>
-    <source_block_id>ieee802_11_decode_mac_0</source_block_id>
-    <sink_block_id>pad_sink_2</sink_block_id>
-    <source_key>out</source_key>
-    <sink_key>in</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>ieee802_11_decode_signal_0</source_block_id>
-    <sink_block_id>blocks_vector_to_stream_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>ieee802_11_decode_signal_0</source_block_id>
-    <sink_block_id>ieee802_11_decode_mac_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>ieee802_11_equalize_symbols_0</source_block_id>
-    <sink_block_id>ieee802_11_decode_signal_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>ieee802_11_mapper_0</source_block_id>
-    <sink_block_id>digital_packet_headergenerator_bb_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>ieee802_11_mapper_0</source_block_id>
-    <sink_block_id>ieee802_11_chunks_to_symbols_xx_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>pad_source_0</source_block_id>
     <sink_block_id>blocks_complex_to_mag_squared_0</sink_block_id>
diff --git a/examples/wifi_rx.grc b/examples/wifi_rx.grc
index 445a00a..db8be82 100644
--- a/examples/wifi_rx.grc
+++ b/examples/wifi_rx.grc
@@ -85,7 +85,7 @@
     <key>variable_chooser</key>
     <param>
       <key>choices</key>
-      <value>[0, 1]</value>
+      <value>[ieee802_11.LS, ieee802_11.LMS, ieee802_11.STA, ieee802_11.COMB]</value>
     </param>
     <param>
       <key>comment</key>
@@ -93,7 +93,7 @@
     </param>
     <param>
       <key>value</key>
-      <value>1</value>
+      <value>ieee802_11.LS</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -101,7 +101,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(360, 7)</value>
+      <value>(352, 16)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -121,7 +121,7 @@
     </param>
     <param>
       <key>labels</key>
-      <value>["LMS", "Linear Comb"]</value>
+      <value>["LS", "LMS", "STA", "Linear Comb"]</value>
     </param>
     <param>
       <key>notebook</key>
@@ -156,7 +156,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(808, 16)</value>
+      <value>(824, 17)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -211,7 +211,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(688, 15)</value>
+      <value>(704, 16)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -325,7 +325,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(992, 16)</value>
+      <value>(1008, 17)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -434,7 +434,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1016, 312)</value>
+      <value>(1016, 313)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -477,7 +477,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(464, 224)</value>
+      <value>(464, 241)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -520,7 +520,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(424, 336)</value>
+      <value>(432, 329)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -563,7 +563,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(480, 584)</value>
+      <value>(488, 563)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -618,7 +618,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(264, 336)</value>
+      <value>(264, 323)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -669,7 +669,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1168, 400)</value>
+      <value>(1169, 400)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -728,7 +728,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(760, 941)</value>
+      <value>(768, 931)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -771,7 +771,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(664, 288)</value>
+      <value>(664, 297)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -822,7 +822,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(728, 1104)</value>
+      <value>(584, 843)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -830,11 +830,11 @@
     </param>
     <param>
       <key>id</key>
-      <value>blocks_pdu_to_tagged_stream_0</value>
+      <value>blocks_pdu_to_tagged_stream_1</value>
     </param>
     <param>
       <key>type</key>
-      <value>float</value>
+      <value>complex</value>
     </param>
     <param>
       <key>tag</key>
@@ -869,7 +869,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(912, 560)</value>
+      <value>(920, 547)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -900,57 +900,6 @@
       <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>(640, 848)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>blocks_vector_to_stream_0</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>num_items</key>
-      <value>48</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-  </block>
   <block>
     <key>fft_vxx</key>
     <param>
@@ -979,7 +928,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(152, 687)</value>
+      <value>(168, 667)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1038,7 +987,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(960, 949)</value>
+      <value>(952, 939)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1061,6 +1010,104 @@
       <value>127</value>
     </param>
   </block>
+  <block>
+    <key>ieee802_11_decode_mac</key>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>debug</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(872, 675)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>ieee802_11_decode_mac_0</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+  </block>
+  <block>
+    <key>ieee802_11_frame_equalizer</key>
+    <param>
+      <key>algo</key>
+      <value>chan_est</value>
+    </param>
+    <param>
+      <key>alias</key>
+      <value></value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>affinity</key>
+      <value></value>
+    </param>
+    <param>
+      <key>debug</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(448, 683)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>ieee802_11_frame_equalizer_0</value>
+    </param>
+    <param>
+      <key>log</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+  </block>
   <block>
     <key>ieee802_11_moving_average_xx</key>
     <param>
@@ -1081,7 +1128,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(808, 312)</value>
+      <value>(808, 307)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1128,7 +1175,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(808, 224)</value>
+      <value>(800, 235)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1155,147 +1202,6 @@
       <value>float</value>
     </param>
   </block>
-  <block>
-    <key>ieee802_11_decode_mac</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>debug</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(960, 709)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>ieee802_11_decode_mac_0</value>
-    </param>
-    <param>
-      <key>log</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>ieee802_11_decode_signal</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>debug</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(664, 709)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>ieee802_11_decode_signal_0</value>
-    </param>
-    <param>
-      <key>log</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-  </block>
-  <block>
-    <key>ieee802_11_equalize_symbols</key>
-    <param>
-      <key>algo</key>
-      <value>chan_est</value>
-    </param>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>debug</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(416, 709)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>ieee802_11_equalize_symbols_0</value>
-    </param>
-    <param>
-      <key>maxoutbuf</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>minoutbuf</key>
-      <value>0</value>
-    </param>
-  </block>
   <block>
     <key>ieee802_11_parse_mac</key>
     <param>
@@ -1320,7 +1226,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(976, 1101)</value>
+      <value>(984, 1083)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1332,7 +1238,7 @@
     </param>
     <param>
       <key>log</key>
-      <value>False</value>
+      <value>True</value>
     </param>
     <param>
       <key>maxoutbuf</key>
@@ -1367,7 +1273,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(672, 536)</value>
+      <value>(728, 531)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1418,7 +1324,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(216, 488)</value>
+      <value>(224, 505)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1465,7 +1371,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(520, 13)</value>
+      <value>(536, 14)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2420,7 +2326,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(32, 213)</value>
+      <value>(24, 219)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2571,105 +2477,6 @@
       <value></value>
     </param>
   </block>
-  <block>
-    <key>wxgui_numbersink2</key>
-    <param>
-      <key>avg_alpha</key>
-      <value>0.02</value>
-    </param>
-    <param>
-      <key>average</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>comment</key>
-      <value></value>
-    </param>
-    <param>
-      <key>affinity</key>
-      <value></value>
-    </param>
-    <param>
-      <key>decimal_places</key>
-      <value>2</value>
-    </param>
-    <param>
-      <key>_enabled</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>factor</key>
-      <value>1.0</value>
-    </param>
-    <param>
-      <key>_coordinate</key>
-      <value>(520, 1035)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-    <param>
-      <key>grid_pos</key>
-      <value></value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>wxgui_numbersink2_0</value>
-    </param>
-    <param>
-      <key>max_value</key>
-      <value>100</value>
-    </param>
-    <param>
-      <key>min_value</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>notebook</key>
-      <value></value>
-    </param>
-    <param>
-      <key>number_rate</key>
-      <value>15</value>
-    </param>
-    <param>
-      <key>peak_hold</key>
-      <value>False</value>
-    </param>
-    <param>
-      <key>ref_level</key>
-      <value>0</value>
-    </param>
-    <param>
-      <key>samp_rate</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>show_gauge</key>
-      <value>True</value>
-    </param>
-    <param>
-      <key>title</key>
-      <value>Frame Error Rate</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>float</value>
-    </param>
-    <param>
-      <key>units</key>
-      <value>%</value>
-    </param>
-    <param>
-      <key>win_size</key>
-      <value></value>
-    </param>
-  </block>
   <block>
     <key>wxgui_scopesink2</key>
     <param>
@@ -2694,7 +2501,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(408, 816)</value>
+      <value>(376, 803)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2781,7 +2588,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1167, 552)</value>
+      <value>(1147, 536)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2899,8 +2706,8 @@
     <sink_key>0</sink_key>
   </connection>
   <connection>
-    <source_block_id>blocks_pdu_to_tagged_stream_0</source_block_id>
-    <sink_block_id>wxgui_numbersink2_0</sink_block_id>
+    <source_block_id>blocks_pdu_to_tagged_stream_1</source_block_id>
+    <sink_block_id>wxgui_scopesink1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2910,15 +2717,9 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
-  <connection>
-    <source_block_id>blocks_vector_to_stream_0</source_block_id>
-    <sink_block_id>wxgui_scopesink1</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>fft_vxx_0</source_block_id>
-    <sink_block_id>ieee802_11_equalize_symbols_0</sink_block_id>
+    <sink_block_id>ieee802_11_frame_equalizer_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
@@ -2928,6 +2729,30 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>ieee802_11_decode_mac_0</source_block_id>
+    <sink_block_id>foo_wireshark_connector_0</sink_block_id>
+    <source_key>out</source_key>
+    <sink_key>in</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>ieee802_11_decode_mac_0</source_block_id>
+    <sink_block_id>ieee802_11_parse_mac_0</sink_block_id>
+    <source_key>out</source_key>
+    <sink_key>in</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>ieee802_11_frame_equalizer_0</source_block_id>
+    <sink_block_id>ieee802_11_decode_mac_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
+  <connection>
+    <source_block_id>ieee802_11_frame_equalizer_0</source_block_id>
+    <sink_block_id>blocks_pdu_to_tagged_stream_1</sink_block_id>
+    <source_key>symbols</source_key>
+    <sink_key>pdus</sink_key>
+  </connection>
   <connection>
     <source_block_id>ieee802_11_moving_average_xx_0</source_block_id>
     <sink_block_id>blocks_complex_to_mag_0</sink_block_id>
@@ -2946,42 +2771,6 @@
     <source_key>0</source_key>
     <sink_key>1</sink_key>
   </connection>
-  <connection>
-    <source_block_id>ieee802_11_decode_mac_0</source_block_id>
-    <sink_block_id>foo_wireshark_connector_0</sink_block_id>
-    <source_key>out</source_key>
-    <sink_key>in</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>ieee802_11_decode_mac_0</source_block_id>
-    <sink_block_id>ieee802_11_parse_mac_0</sink_block_id>
-    <source_key>out</source_key>
-    <sink_key>in</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>ieee802_11_decode_signal_0</source_block_id>
-    <sink_block_id>blocks_vector_to_stream_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>ieee802_11_decode_signal_0</source_block_id>
-    <sink_block_id>ieee802_11_decode_mac_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>ieee802_11_equalize_symbols_0</source_block_id>
-    <sink_block_id>ieee802_11_decode_signal_0</sink_block_id>
-    <source_key>0</source_key>
-    <sink_key>0</sink_key>
-  </connection>
-  <connection>
-    <source_block_id>ieee802_11_parse_mac_0</source_block_id>
-    <sink_block_id>blocks_pdu_to_tagged_stream_0</sink_block_id>
-    <source_key>fer</source_key>
-    <sink_key>pdus</sink_key>
-  </connection>
   <connection>
     <source_block_id>ieee802_11_sync_long_0</source_block_id>
     <sink_block_id>blocks_stream_to_vector_0</sink_block_id>
diff --git a/examples/wifi_transceiver.grc b/examples/wifi_transceiver.grc
index e695c01..b1516b4 100644
--- a/examples/wifi_transceiver.grc
+++ b/examples/wifi_transceiver.grc
@@ -81,6 +81,61 @@
       <value></value>
     </param>
   </block>
+  <block>
+    <key>variable_chooser</key>
+    <param>
+      <key>choices</key>
+      <value>[ieee802_11.LS, ieee802_11.COMB]</value>
+    </param>
+    <param>
+      <key>comment</key>
+      <value></value>
+    </param>
+    <param>
+      <key>value</key>
+      <value>ieee802_11.LS</value>
+    </param>
+    <param>
+      <key>_enabled</key>
+      <value>True</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(1120, 131)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>grid_pos</key>
+      <value></value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>chan_est</value>
+    </param>
+    <param>
+      <key>label</key>
+      <value></value>
+    </param>
+    <param>
+      <key>labels</key>
+      <value>["LS", "Linear Comb"]</value>
+    </param>
+    <param>
+      <key>notebook</key>
+      <value></value>
+    </param>
+    <param>
+      <key>style</key>
+      <value>wx.RA_HORIZONTAL</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>radio_buttons</value>
+    </param>
+  </block>
   <block>
     <key>variable_chooser</key>
     <param>
@@ -507,7 +562,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(32, 325)</value>
+      <value>(48, 403)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -554,7 +609,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(424, 600)</value>
+      <value>(480, 564)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -581,6 +636,53 @@
       <value>1</value>
     </param>
   </block>
+  <block>
+    <key>blocks_pdu_to_tagged_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>1</value>
+    </param>
+    <param>
+      <key>_coordinate</key>
+      <value>(116, 592)</value>
+    </param>
+    <param>
+      <key>_rotation</key>
+      <value>270</value>
+    </param>
+    <param>
+      <key>id</key>
+      <value>blocks_pdu_to_tagged_stream_0_0</value>
+    </param>
+    <param>
+      <key>type</key>
+      <value>complex</value>
+    </param>
+    <param>
+      <key>tag</key>
+      <value>packet_len</value>
+    </param>
+    <param>
+      <key>maxoutbuf</key>
+      <value>0</value>
+    </param>
+    <param>
+      <key>minoutbuf</key>
+      <value>0</value>
+    </param>
+  </block>
   <block>
     <key>blocks_tuntap_pdu</key>
     <param>
@@ -664,7 +766,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(368, 719)</value>
+      <value>(424, 752)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -715,7 +817,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(208, 333)</value>
+      <value>(232, 411)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -762,7 +864,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(616, 240)</value>
+      <value>(616, 265)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -809,7 +911,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(616, 384)</value>
+      <value>(608, 379)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -856,7 +958,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(224, 429)</value>
+      <value>(280, 492)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1551,7 +1653,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(528, 695)</value>
+      <value>(584, 736)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1677,6 +1779,10 @@
       <key>hide_cmd_port</key>
       <value>False</value>
     </param>
+    <param>
+      <key>hide_lo_controls</key>
+      <value>True</value>
+    </param>
     <param>
       <key>stream_args</key>
       <value></value>
@@ -1732,6 +1838,14 @@
       <key>gain0</key>
       <value>rx_gain</value>
     </param>
+    <param>
+      <key>lo_export0</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source0</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant10</key>
       <value></value>
@@ -1760,6 +1874,14 @@
       <key>gain10</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export10</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source10</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant11</key>
       <value></value>
@@ -1788,6 +1910,14 @@
       <key>gain11</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export11</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source11</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant12</key>
       <value></value>
@@ -1816,6 +1946,14 @@
       <key>gain12</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export12</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source12</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant13</key>
       <value></value>
@@ -1844,6 +1982,14 @@
       <key>gain13</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export13</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source13</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant14</key>
       <value></value>
@@ -1872,6 +2018,14 @@
       <key>gain14</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export14</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source14</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant15</key>
       <value></value>
@@ -1900,6 +2054,14 @@
       <key>gain15</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export15</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source15</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant16</key>
       <value></value>
@@ -1928,6 +2090,14 @@
       <key>gain16</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export16</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source16</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant17</key>
       <value></value>
@@ -1956,6 +2126,14 @@
       <key>gain17</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export17</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source17</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant18</key>
       <value></value>
@@ -1984,6 +2162,14 @@
       <key>gain18</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export18</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source18</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant19</key>
       <value></value>
@@ -2012,6 +2198,14 @@
       <key>gain19</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export19</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source19</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant1</key>
       <value></value>
@@ -2040,6 +2234,14 @@
       <key>gain1</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export1</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source1</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant20</key>
       <value></value>
@@ -2068,6 +2270,14 @@
       <key>gain20</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export20</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source20</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant21</key>
       <value></value>
@@ -2096,6 +2306,14 @@
       <key>gain21</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export21</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source21</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant22</key>
       <value></value>
@@ -2124,6 +2342,14 @@
       <key>gain22</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export22</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source22</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant23</key>
       <value></value>
@@ -2152,6 +2378,14 @@
       <key>gain23</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export23</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source23</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant24</key>
       <value></value>
@@ -2180,6 +2414,14 @@
       <key>gain24</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export24</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source24</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant25</key>
       <value></value>
@@ -2208,6 +2450,14 @@
       <key>gain25</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export25</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source25</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant26</key>
       <value></value>
@@ -2236,6 +2486,14 @@
       <key>gain26</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export26</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source26</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant27</key>
       <value></value>
@@ -2264,6 +2522,14 @@
       <key>gain27</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export27</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source27</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant28</key>
       <value></value>
@@ -2292,6 +2558,14 @@
       <key>gain28</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export28</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source28</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant29</key>
       <value></value>
@@ -2320,6 +2594,14 @@
       <key>gain29</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export29</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source29</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant2</key>
       <value></value>
@@ -2348,6 +2630,14 @@
       <key>gain2</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export2</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source2</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant30</key>
       <value></value>
@@ -2376,6 +2666,14 @@
       <key>gain30</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export30</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source30</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant31</key>
       <value></value>
@@ -2404,6 +2702,14 @@
       <key>gain31</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export31</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source31</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant3</key>
       <value></value>
@@ -2432,6 +2738,14 @@
       <key>gain3</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export3</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source3</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant4</key>
       <value></value>
@@ -2460,6 +2774,14 @@
       <key>gain4</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export4</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source4</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant5</key>
       <value></value>
@@ -2488,6 +2810,14 @@
       <key>gain5</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export5</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source5</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant6</key>
       <value></value>
@@ -2516,6 +2846,14 @@
       <key>gain6</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export6</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source6</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant7</key>
       <value></value>
@@ -2544,6 +2882,14 @@
       <key>gain7</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export7</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source7</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant8</key>
       <value></value>
@@ -2572,6 +2918,14 @@
       <key>gain8</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export8</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source8</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>ant9</key>
       <value></value>
@@ -2600,6 +2954,14 @@
       <key>gain9</key>
       <value>0</value>
     </param>
+    <param>
+      <key>lo_export9</key>
+      <value>False</value>
+    </param>
+    <param>
+      <key>lo_source9</key>
+      <value>internal</value>
+    </param>
     <param>
       <key>clock_rate</key>
       <value>0.0</value>
@@ -2626,7 +2988,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(744, 702)</value>
+      <value>(800, 744)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2760,6 +3122,10 @@
       <key>hide_cmd_port</key>
       <value>False</value>
     </param>
+    <param>
+      <key>hide_lo_controls</key>
+      <value>True</value>
+    </param>
     <param>
       <key>stream_args</key>
       <value></value>
@@ -2797,7 +3163,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(648, 504)</value>
+      <value>(664, 504)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -2815,14 +3181,22 @@
       <key>minoutbuf</key>
       <value>0</value>
     </param>
+    <param>
+      <key>bandwidth</key>
+      <value>10e6</value>
+    </param>
     <param>
       <key>chan_est</key>
-      <value>0</value>
+      <value>chan_est</value>
     </param>
     <param>
       <key>encoding</key>
       <value>0</value>
     </param>
+    <param>
+      <key>frequency</key>
+      <value>5.89e9</value>
+    </param>
     <param>
       <key>sensitivity</key>
       <value>0.56</value>
@@ -2852,11 +3226,11 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(176, 527)</value>
+      <value>(200, 744)</value>
     </param>
     <param>
       <key>_rotation</key>
-      <value>180</value>
+      <value>0</value>
     </param>
     <param>
       <key>grid_pos</key>
@@ -2921,6 +3295,12 @@
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
+  <connection>
+    <source_block_id>blocks_pdu_to_tagged_stream_0_0</source_block_id>
+    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
+    <source_key>0</source_key>
+    <sink_key>0</sink_key>
+  </connection>
   <connection>
     <source_block_id>blocks_tuntap_pdu_0</source_block_id>
     <sink_block_id>ieee802_11_ether_encap_0</sink_block_id>
@@ -2965,9 +3345,9 @@
   </connection>
   <connection>
     <source_block_id>wifi_phy_hier_0</source_block_id>
-    <sink_block_id>wxgui_scopesink2_0</sink_block_id>
-    <source_key>1</source_key>
-    <sink_key>0</sink_key>
+    <sink_block_id>blocks_pdu_to_tagged_stream_0_0</sink_block_id>
+    <source_key>carrier</source_key>
+    <sink_key>pdus</sink_key>
   </connection>
   <connection>
     <source_block_id>wifi_phy_hier_0</source_block_id>
diff --git a/examples/wifi_tx.grc b/examples/wifi_tx.grc
index 12c1fef..a773ade 100644
--- a/examples/wifi_tx.grc
+++ b/examples/wifi_tx.grc
@@ -101,7 +101,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(608, 8)</value>
+      <value>(616, 3)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -156,7 +156,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(288, 8)</value>
+      <value>(296, 3)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -211,7 +211,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(792, 120)</value>
+      <value>(792, 123)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -266,7 +266,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(792, 7)</value>
+      <value>(792, 3)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -317,7 +317,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(8, 123)</value>
+      <value>(8, 75)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -352,7 +352,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(920, 7)</value>
+      <value>(920, 3)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -411,7 +411,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(1040, 7)</value>
+      <value>(1040, 3)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -470,7 +470,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(464, 8)</value>
+      <value>(472, 3)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -525,7 +525,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(176, 7)</value>
+      <value>(176, 3)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -584,7 +584,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(208, 157)</value>
+      <value>(168, 164)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -635,7 +635,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(208, 472)</value>
+      <value>(200, 460)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -662,53 +662,6 @@
       <value>1</value>
     </param>
   </block>
-  <block>
-    <key>blocks_null_sink</key>
-    <param>
-      <key>alias</key>
-      <value></value>
-    </param>
-    <param>
-      <key>bus_conns</key>
-      <value>[[0,],]</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>(344, 424)</value>
-    </param>
-    <param>
-      <key>_rotation</key>
-      <value>180</value>
-    </param>
-    <param>
-      <key>id</key>
-      <value>blocks_null_sink_0</value>
-    </param>
-    <param>
-      <key>type</key>
-      <value>complex</value>
-    </param>
-    <param>
-      <key>num_inputs</key>
-      <value>1</value>
-    </param>
-    <param>
-      <key>vlen</key>
-      <value>1</value>
-    </param>
-  </block>
   <block>
     <key>blocks_null_source</key>
     <param>
@@ -733,7 +686,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(664, 448)</value>
+      <value>(640, 448)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -784,7 +737,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(216, 230)</value>
+      <value>(232, 264)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -855,7 +808,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(120, 575)</value>
+      <value>(176, 568)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -910,7 +863,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(464, 248)</value>
+      <value>(440, 284)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1605,7 +1558,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(288, 551)</value>
+      <value>(392, 552)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1731,6 +1684,10 @@
       <key>hide_cmd_port</key>
       <value>False</value>
     </param>
+    <param>
+      <key>hide_lo_controls</key>
+      <value>True</value>
+    </param>
     <param>
       <key>stream_args</key>
       <value></value>
@@ -1772,7 +1729,7 @@
     </param>
     <param>
       <key>_coordinate</key>
-      <value>(480, 376)</value>
+      <value>(464, 400)</value>
     </param>
     <param>
       <key>_rotation</key>
@@ -1790,6 +1747,10 @@
       <key>minoutbuf</key>
       <value>0</value>
     </param>
+    <param>
+      <key>bandwidth</key>
+      <value>10e6</value>
+    </param>
     <param>
       <key>chan_est</key>
       <value>0</value>
@@ -1798,6 +1759,10 @@
       <key>encoding</key>
       <value>encoding</value>
     </param>
+    <param>
+      <key>frequency</key>
+      <value>5.89e9</value>
+    </param>
     <param>
       <key>sensitivity</key>
       <value>0.56</value>
@@ -1839,12 +1804,6 @@
     <source_key>phy out</source_key>
     <sink_key>mac_in</sink_key>
   </connection>
-  <connection>
-    <source_block_id>wifi_phy_hier_0</source_block_id>
-    <sink_block_id>blocks_null_sink_0</sink_block_id>
-    <source_key>1</source_key>
-    <sink_key>0</sink_key>
-  </connection>
   <connection>
     <source_block_id>wifi_phy_hier_0</source_block_id>
     <sink_block_id>ieee802_11_mac_0</sink_block_id>