diff --git a/grc/gen_bladerf_blocks.py b/grc/gen_bladerf_blocks.py
index 4969563c7267bd68c07e1d6fd187d4eed966cbf7..a5b2e99ff0335a036ec36b414a86a3a7377ffb42 100644
--- a/grc/gen_bladerf_blocks.py
+++ b/grc/gen_bladerf_blocks.py
@@ -46,6 +46,13 @@ parameters:
   default: 1
   options: [ ${", ".join([str(n) for n in range(1, max_nchan+1)])} ]
   
+- id: verbosity
+  label: 'Verbosity'
+  dtype: enum
+  default: verbose
+  options: ['verbose', 'debug', 'info', 'warning', 'error', 'critical', 'silent']
+  option_labels: [verbose, debug, info, warning, error, critical, silent]
+  
 - id: sample_rate
   label: 'Sample Rate (sps)'
   dtype: real
@@ -81,9 +88,9 @@ parameters:
   dtype: real
   default: 10000
 
-
 ${params}
 
+
 inputs:
 - domain: message
   id: command
@@ -109,7 +116,9 @@ templates:
      import time
   make: |
     bladeRF.${sourk}(
-        args="numchan=" + str(${'$'}{nchan}) + " " + ${'$'}{args}
+        args="numchan=" + str(${'$'}{nchan}) + ","
+             + "verbosity=" + '${'$'}{verbosity}' 
+              + ${'$'}{args}
     )
     self.${'$'}{id}.set_sample_rate(${'$'}{sample_rate})
     % for n in range(max_nchan):
@@ -119,7 +128,7 @@ templates:
     % if sourk == 'source':
     self.${'$'}{id}.set_dc_offset_mode(${'$'}{${'dc_offset_mode' + str(n)}}, ${n})
     self.${'$'}{id}.set_iq_balance_mode(${'$'}{${'iq_balance_mode' + str(n)}}, ${n})
-    self.${'$'}{id}.set_gain_mode(${'$'}{${'gain_mode' + str(n)}}, ${n})
+    self.${'$'}{id}.set_gain_mode(${'$'}{${'gain_mode' + str(n)}}, ${n})    
     % endif
     self.${'$'}{id}.set_gain(${'$'}{${'gain' + str(n)}}, ${n})
     self.${'$'}{id}.set_if_gain(${'$'}{${'if_gain' + str(n)}}, ${n})
diff --git a/lib/arg_helpers.h b/lib/arg_helpers.h
index 3b02b8ffb250ba640a542ebd66466a775b3c96c6..c2bebfce7a5a26ea361b33e5a7b09d1be7583b51 100644
--- a/lib/arg_helpers.h
+++ b/lib/arg_helpers.h
@@ -54,7 +54,10 @@ inline std::vector< std::string > args_to_vector( const std::string &args )
   tokenizer_t tokens(args, separator);
 
   for (std::string token : tokens)
-    result.push_back(token);
+  {
+      result.push_back(token);
+  }
+
 
   return result;
 }
@@ -94,7 +97,7 @@ inline pair_t param_to_pair( const std::string &param )
 
 inline dict_t params_to_dict( const std::string &params )
 {
-  dict_t result;
+  dict_t result;  
 
   std::vector< std::string > param_list = params_to_vector( params );
   for (std::string param : param_list)
@@ -121,7 +124,7 @@ inline gr::io_signature::sptr args_to_io_signature( const std::string &args )
 {
   size_t max_nchan = 0;
   size_t dev_nchan = 0;
-  std::vector< std::string > arg_list = args_to_vector( args );
+  std::vector< std::string > arg_list = params_to_vector( args );
 
   for (std::string arg : arg_list)
   {
diff --git a/lib/bladerf/bladerf_common.cc b/lib/bladerf/bladerf_common.cc
index 67bf7367447423fde5bd4cbeb5ad075de35924b7..b71e0662495a2a77374df6ad51187e30f2aa4cd6 100644
--- a/lib/bladerf/bladerf_common.cc
+++ b/lib/bladerf/bladerf_common.cc
@@ -40,6 +40,7 @@
 
 #include "bladerf_common.h"
 
+
 /* Defaults for these values. */
 static size_t const NUM_BUFFERS = 512;
 static size_t const NUM_SAMPLES_PER_BUFFER = (4 * 1024);
diff --git a/lib/bladerf/bladerf_source_c.cc b/lib/bladerf/bladerf_source_c.cc
index 83db677a1015986908fcf509048b0ce81b3867fa..486a00adec69843589a9f7a910911c7450661e99 100644
--- a/lib/bladerf/bladerf_source_c.cc
+++ b/lib/bladerf/bladerf_source_c.cc
@@ -76,7 +76,6 @@ bladerf_source_c::bladerf_source_c(const std::string &args) :
   int status;
 
   dict_t dict = params_to_dict(args);
-
   /* Perform src/sink agnostic initializations */
   init(dict, BLADERF_RX);
 
diff --git a/lib/sink_impl.cc b/lib/sink_impl.cc
index 9f7c0260d349dd11b803691c2c21304877d54b95..2d3b1058171f8f074d9a63ac55753676a6cac9b6 100644
--- a/lib/sink_impl.cc
+++ b/lib/sink_impl.cc
@@ -32,7 +32,7 @@ namespace gr {
             throw std::runtime_error("No supported devices found "
                                      "(check the connection and/or udev rules).");
 
-        device_ = make_bladerf_sink_c( dev_list[0] ); //todo: get by id from block args
+        device_ = make_bladerf_sink_c( args ); //todo: get by id from block args
     }
 
     /*
diff --git a/lib/source_impl.cc b/lib/source_impl.cc
index 01488365453a76ede8af638af434f05a3849e309..60d5716697cece56bd95d58e5a121e3906eebd71 100644
--- a/lib/source_impl.cc
+++ b/lib/source_impl.cc
@@ -34,7 +34,7 @@ namespace gr {
             throw std::runtime_error("No supported devices found "
                                      "(check the connection and/or udev rules).");
 
-        device_ = make_bladerf_source_c( dev_list[0] ); //todo: get by id from block args
+        device_ = make_bladerf_source_c( args ); //todo: get by id from block args
         for (size_t i = 0; i < device_->get_num_channels(); i++) {
   #ifdef HAVE_IQBALANCE
           gr::iqbalance::optimize_c::sptr iq_opt = gr::iqbalance::optimize_c::make( 0 );