diff --git a/applications/tari_console_wallet/src/init/mod.rs b/applications/tari_console_wallet/src/init/mod.rs
index 0348ebc319..278b331d02 100644
--- a/applications/tari_console_wallet/src/init/mod.rs
+++ b/applications/tari_console_wallet/src/init/mod.rs
@@ -348,6 +348,7 @@ pub async fn init_wallet(
     let base_node_service_config = BaseNodeServiceConfig::new(
         config.wallet_base_node_service_refresh_interval,
         config.wallet_base_node_service_request_max_age,
+        config.base_node_event_channel_size,
     );
 
     let factories = CryptoFactories::default();
@@ -363,17 +364,20 @@ pub async fn init_wallet(
                 config.transaction_routing_mechanism.clone(),
             ),
             num_confirmations_required: config.transaction_num_confirmations_required,
+            transaction_event_channel_size: config.transaction_event_channel_size,
             ..Default::default()
         }),
         Some(OutputManagerServiceConfig {
             base_node_query_timeout: config.base_node_query_timeout,
             prevent_fee_gt_amount: config.prevent_fee_gt_amount,
+            event_channel_size: config.output_manager_event_channel_size,
+            base_node_update_publisher_channel_size: config.base_node_update_publisher_channel_size,
             ..Default::default()
         }),
         config.network.into(),
         Some(base_node_service_config),
-        Some(config.buffer_size_base_node_wallet),
-        Some(config.buffer_rate_limit_base_node_wallet),
+        Some(config.buffer_size_console_wallet),
+        Some(config.buffer_rate_limit_console_wallet),
         Some(config.scan_for_utxo_interval),
     );
     wallet_config.buffer_size = std::cmp::max(BASE_NODE_BUFFER_MIN_SIZE, config.buffer_size_base_node);
diff --git a/applications/tari_console_wallet/src/ui/state/wallet_event_monitor.rs b/applications/tari_console_wallet/src/ui/state/wallet_event_monitor.rs
index fb0a66b466..b656372fcc 100644
--- a/applications/tari_console_wallet/src/ui/state/wallet_event_monitor.rs
+++ b/applications/tari_console_wallet/src/ui/state/wallet_event_monitor.rs
@@ -63,7 +63,7 @@ impl WalletEventMonitor {
                     result = transaction_service_events.select_next_some() => {
                         match result {
                             Ok(msg) => {
-                                trace!(target: LOG_TARGET, "Wallet Event Monitor received wallet event {:?}", msg);
+                                trace!(target: LOG_TARGET, "Wallet Event Monitor received wallet transaction service event {:?}", msg);
                                 match (*msg).clone() {
                                     TransactionEvent::ReceivedFinalizedTransaction(tx_id) => {
                                         self.trigger_tx_state_refresh(tx_id).await;
@@ -108,7 +108,7 @@ impl WalletEventMonitor {
                     result = connectivity_events.select_next_some() => {
                         match result {
                             Ok(msg) => {
-                                trace!(target: LOG_TARGET, "Wallet Event Monitor received wallet event {:?}", msg);
+                                trace!(target: LOG_TARGET, "Wallet Event Monitor received wallet connectivity event {:?}", msg);
                                 match &*msg {
                                     ConnectivityEvent::PeerDisconnected(_) |
                                     ConnectivityEvent::ManagedPeerDisconnected(_) |
diff --git a/base_layer/core/src/base_node/service/service.rs b/base_layer/core/src/base_node/service/service.rs
index cfa56ec9af..db96b6ed9e 100644
--- a/base_layer/core/src/base_node/service/service.rs
+++ b/base_layer/core/src/base_node/service/service.rs
@@ -544,7 +544,7 @@ async fn handle_outbound_request(
                     Request::FetchBlocksWithUtxos(_) => {
                         trace!(
                             target: LOG_TARGET,
-                            "Timeout for service request ({}) at {:?}",
+                            "Timeout for service request FetchBlocks... ({}) set at {:?}",
                             request_key,
                             config.fetch_blocks_timeout
                         );
@@ -553,7 +553,7 @@ async fn handle_outbound_request(
                     Request::FetchMatchingUtxos(_) => {
                         trace!(
                             target: LOG_TARGET,
-                            "Timeout for service request ({}) at {:?}",
+                            "Timeout for service request FetchMatchingUtxos ({}) set at {:?}",
                             request_key,
                             config.fetch_utxos_timeout
                         );
@@ -562,7 +562,7 @@ async fn handle_outbound_request(
                     _ => {
                         trace!(
                             target: LOG_TARGET,
-                            "Timeout for service request ({}) at {:?}",
+                            "Timeout for service request ... ({}) set at {:?}",
                             request_key,
                             config.service_request_timeout
                         );
@@ -638,7 +638,7 @@ async fn handle_request_timeout(
         let _ = reply_tx.send(reply_msg.map_err(|e| {
             error!(
                 target: LOG_TARGET,
-                "Failed to send outbound request (request key: {}): {:?}", &request_key, e
+                "Failed to process outbound request (request key: {}): {:?}", &request_key, e
             );
             e
         }));
diff --git a/base_layer/core/src/mempool/service/service.rs b/base_layer/core/src/mempool/service/service.rs
index ed14d68410..b8ee487b9c 100644
--- a/base_layer/core/src/mempool/service/service.rs
+++ b/base_layer/core/src/mempool/service/service.rs
@@ -475,7 +475,7 @@ async fn handle_request_timeout(
         let _ = reply_tx.send(reply_msg.map_err(|e| {
             error!(
                 target: LOG_TARGET,
-                "Failed to send outbound request (request key: {}): {:?}", &request_key, e
+                "Failed to process outbound request (request key: {}): {:?}", &request_key, e
             );
             e
         }));
diff --git a/base_layer/wallet/src/base_node_service/config.rs b/base_layer/wallet/src/base_node_service/config.rs
index 605af920bf..e7468a809e 100644
--- a/base_layer/wallet/src/base_node_service/config.rs
+++ b/base_layer/wallet/src/base_node_service/config.rs
@@ -30,6 +30,7 @@ pub struct BaseNodeServiceConfig {
     pub base_node_monitor_refresh_interval: Duration,
     pub base_node_rpc_pool_size: usize,
     pub request_max_age: Duration,
+    pub event_channel_size: usize,
 }
 
 impl Default for BaseNodeServiceConfig {
@@ -38,21 +39,25 @@ impl Default for BaseNodeServiceConfig {
             base_node_monitor_refresh_interval: Duration::from_secs(5),
             base_node_rpc_pool_size: 10,
             request_max_age: Duration::from_secs(60),
+            event_channel_size: 250,
         }
     }
 }
 
 impl BaseNodeServiceConfig {
-    pub fn new(refresh_interval: u64, request_max_age: u64) -> Self {
+    pub fn new(refresh_interval: u64, request_max_age: u64, event_channel_size: usize) -> Self {
         info!(
             target: LOG_TARGET,
-            "Setting new wallet base node service config, refresh interval: {}s, request max age: {}s",
+            "Setting new wallet base node service config, refresh interval: {}s, request max age: {}s, event channel \
+             size : {}",
             refresh_interval,
-            request_max_age
+            request_max_age,
+            event_channel_size
         );
         Self {
             base_node_monitor_refresh_interval: Duration::from_secs(refresh_interval),
             request_max_age: Duration::from_secs(request_max_age),
+            event_channel_size,
             ..Default::default()
         }
     }
diff --git a/base_layer/wallet/src/base_node_service/mod.rs b/base_layer/wallet/src/base_node_service/mod.rs
index 802c91eea2..94ff82aaf6 100644
--- a/base_layer/wallet/src/base_node_service/mod.rs
+++ b/base_layer/wallet/src/base_node_service/mod.rs
@@ -69,7 +69,7 @@ where T: WalletBackend + 'static
 
         let (sender, request_stream) = reply_channel::unbounded();
 
-        let (event_publisher, _) = broadcast::channel(200);
+        let (event_publisher, _) = broadcast::channel(self.config.event_channel_size);
 
         let basenode_service_handle = BaseNodeServiceHandle::new(sender, event_publisher.clone());
 
diff --git a/base_layer/wallet/src/output_manager_service/config.rs b/base_layer/wallet/src/output_manager_service/config.rs
index fb5158e5ce..bd44a02761 100644
--- a/base_layer/wallet/src/output_manager_service/config.rs
+++ b/base_layer/wallet/src/output_manager_service/config.rs
@@ -30,6 +30,8 @@ pub struct OutputManagerServiceConfig {
     pub prevent_fee_gt_amount: bool,
     pub peer_dial_retry_timeout: Duration,
     pub seed_word_language: MnemonicLanguage,
+    pub event_channel_size: usize,
+    pub base_node_update_publisher_channel_size: usize,
 }
 
 impl Default for OutputManagerServiceConfig {
@@ -40,6 +42,8 @@ impl Default for OutputManagerServiceConfig {
             prevent_fee_gt_amount: true,
             peer_dial_retry_timeout: Duration::from_secs(20),
             seed_word_language: MnemonicLanguage::English,
+            event_channel_size: 250,
+            base_node_update_publisher_channel_size: 50,
         }
     }
 }
diff --git a/base_layer/wallet/src/output_manager_service/mod.rs b/base_layer/wallet/src/output_manager_service/mod.rs
index aac9c7b882..ce6fd70699 100644
--- a/base_layer/wallet/src/output_manager_service/mod.rs
+++ b/base_layer/wallet/src/output_manager_service/mod.rs
@@ -106,7 +106,7 @@ where T: OutputManagerBackend + 'static
         );
 
         let (sender, receiver) = reply_channel::unbounded();
-        let (publisher, _) = broadcast::channel(200);
+        let (publisher, _) = broadcast::channel(self.config.event_channel_size);
 
         // Register handle before waiting for handles to be ready
         let oms_handle = OutputManagerHandle::new(sender, publisher.clone());
diff --git a/base_layer/wallet/src/output_manager_service/service.rs b/base_layer/wallet/src/output_manager_service/service.rs
index 0f5e81fadf..94d9ef775b 100644
--- a/base_layer/wallet/src/output_manager_service/service.rs
+++ b/base_layer/wallet/src/output_manager_service/service.rs
@@ -142,7 +142,8 @@ where TBackend: OutputManagerBackend + 'static
             shutdown_signal,
         };
 
-        let (base_node_update_publisher, _) = broadcast::channel(50);
+        let (base_node_update_publisher, _) =
+            broadcast::channel(resources.config.base_node_update_publisher_channel_size);
 
         Ok(OutputManagerService {
             resources,
diff --git a/base_layer/wallet/src/output_manager_service/tasks/txo_validation_task.rs b/base_layer/wallet/src/output_manager_service/tasks/txo_validation_task.rs
index 0eebf7b6db..e3e022e4fb 100644
--- a/base_layer/wallet/src/output_manager_service/tasks/txo_validation_task.rs
+++ b/base_layer/wallet/src/output_manager_service/tasks/txo_validation_task.rs
@@ -264,7 +264,9 @@ where TBackend: OutputManagerBackend + 'static
 
             let mut client = match base_node_connection
                 .connect_rpc_using_builder(
-                    BaseNodeWalletRpcClient::builder().with_deadline(self.resources.config.base_node_query_timeout),
+                    BaseNodeWalletRpcClient::builder()
+                        .with_deadline(self.resources.config.base_node_query_timeout)
+                        .with_handshake_timeout(self.resources.config.base_node_query_timeout),
                 )
                 .await
             {
diff --git a/base_layer/wallet/src/transaction_service/config.rs b/base_layer/wallet/src/transaction_service/config.rs
index 7d3faa4f33..b109b62969 100644
--- a/base_layer/wallet/src/transaction_service/config.rs
+++ b/base_layer/wallet/src/transaction_service/config.rs
@@ -38,6 +38,7 @@ pub struct TransactionServiceConfig {
     pub num_confirmations_required: u64,
     pub max_tx_query_batch_size: usize,
     pub transaction_routing_mechanism: TransactionRoutingMechanism,
+    pub transaction_event_channel_size: usize,
 }
 
 impl Default for TransactionServiceConfig {
@@ -54,6 +55,7 @@ impl Default for TransactionServiceConfig {
             num_confirmations_required: 3,
             max_tx_query_batch_size: 5000,
             transaction_routing_mechanism: TransactionRoutingMechanism::default(),
+            transaction_event_channel_size: 1000,
         }
     }
 }
diff --git a/base_layer/wallet/src/transaction_service/mod.rs b/base_layer/wallet/src/transaction_service/mod.rs
index 2ee17b43e1..3efbade3c3 100644
--- a/base_layer/wallet/src/transaction_service/mod.rs
+++ b/base_layer/wallet/src/transaction_service/mod.rs
@@ -172,7 +172,7 @@ where T: TransactionBackend + 'static
         let base_node_response_stream = self.base_node_response_stream();
         let transaction_cancelled_stream = self.transaction_cancelled_stream();
 
-        let (publisher, _) = broadcast::channel(200);
+        let (publisher, _) = broadcast::channel(self.config.transaction_event_channel_size);
 
         let transaction_handle = TransactionServiceHandle::new(sender, publisher.clone());
 
diff --git a/base_layer/wallet/src/transaction_service/protocols/transaction_broadcast_protocol.rs b/base_layer/wallet/src/transaction_service/protocols/transaction_broadcast_protocol.rs
index 92ad42c789..05191c8f8d 100644
--- a/base_layer/wallet/src/transaction_service/protocols/transaction_broadcast_protocol.rs
+++ b/base_layer/wallet/src/transaction_service/protocols/transaction_broadcast_protocol.rs
@@ -230,7 +230,8 @@ where TBackend: TransactionBackend + 'static
             let mut client = match base_node_connection
                 .connect_rpc_using_builder(
                     BaseNodeWalletRpcClient::builder()
-                        .with_deadline(self.resources.config.broadcast_monitoring_timeout),
+                        .with_deadline(self.resources.config.broadcast_monitoring_timeout)
+                        .with_handshake_timeout(self.resources.config.broadcast_monitoring_timeout),
                 )
                 .await
             {
diff --git a/base_layer/wallet/src/transaction_service/protocols/transaction_coinbase_monitoring_protocol.rs b/base_layer/wallet/src/transaction_service/protocols/transaction_coinbase_monitoring_protocol.rs
index a3d3599714..65fb58f601 100644
--- a/base_layer/wallet/src/transaction_service/protocols/transaction_coinbase_monitoring_protocol.rs
+++ b/base_layer/wallet/src/transaction_service/protocols/transaction_coinbase_monitoring_protocol.rs
@@ -284,7 +284,9 @@ where TBackend: TransactionBackend + 'static
             };
             let mut client = match base_node_connection
                 .connect_rpc_using_builder(
-                    BaseNodeWalletRpcClient::builder().with_deadline(self.resources.config.chain_monitoring_timeout),
+                    BaseNodeWalletRpcClient::builder()
+                        .with_deadline(self.resources.config.chain_monitoring_timeout)
+                        .with_handshake_timeout(self.resources.config.chain_monitoring_timeout),
                 )
                 .await
             {
diff --git a/base_layer/wallet/src/transaction_service/protocols/transaction_validation_protocol.rs b/base_layer/wallet/src/transaction_service/protocols/transaction_validation_protocol.rs
index d94e4a22df..d0b2f7f6ac 100644
--- a/base_layer/wallet/src/transaction_service/protocols/transaction_validation_protocol.rs
+++ b/base_layer/wallet/src/transaction_service/protocols/transaction_validation_protocol.rs
@@ -258,7 +258,11 @@ where TBackend: TransactionBackend + 'static
             };
 
             let mut client = match base_node_connection
-                .connect_rpc_using_builder(BaseNodeWalletRpcClient::builder().with_deadline(self.timeout))
+                .connect_rpc_using_builder(
+                    BaseNodeWalletRpcClient::builder()
+                        .with_deadline(self.timeout)
+                        .with_handshake_timeout(self.timeout),
+                )
                 .await
             {
                 Ok(c) => c,
diff --git a/common/config/presets/tari_config_example.toml b/common/config/presets/tari_config_example.toml
index 09fe5a41fc..9e829d9938 100644
--- a/common/config/presets/tari_config_example.toml
+++ b/common/config/presets/tari_config_example.toml
@@ -43,16 +43,16 @@ network = "weatherwax"
 #liveness_allowlist_cidrs = ["127.0.0.1/32"]
 
 # The buffer size constants for the publish/subscribe connector channel, connecting comms messages to the domain layer:
-# - Buffer size for the base node (min value = 30, default value = 100).
-#buffer_size_base_node = 100
-# - Buffer size for the base node wallet (min value = 300, default value = 1000).
-#buffer_size_base_node_wallet = 1000
+# - Buffer size for the base node (min value = 30, default value = 1500).
+#buffer_size_base_node = 1500
+# - Buffer size for the console wallet (min value = 300, default value = 50000).
+#buffer_size_console_wallet = 50000
 # The rate limit constants for the publish/subscribe connector channel, i.e. maximum amount of inbound messages to
 # accept - any rate attemting to exceed this limit will be throttled.
-# - Rate limit for the base node (min value = 5, default value = 20).
-#buffer_rate_limit_base_node = 20
-# - Rate limit for the base node wallet (min value = 5, default value = 20).
-#buffer_rate_limit_base_node_wallet = 20
+# - Rate limit for the base node (min value = 5, default value = 1000).
+#buffer_rate_limit_base_node = 1000
+# - Rate limit for the console wallet (min value = 5, default value = 1000).
+buffer_rate_limit_console_wallet = 1000
 # The message deduplication persistent cache size - messages with these hashes in the cache will only be processed once.
 # The cache will also be trimmed down to size periodically (min value = 0, default value = 2500).
 dedup_cache_capacity = 25000
@@ -66,8 +66,9 @@ dedup_cache_capacity = 25000
 # The timeout (s) for requesting other base node services (min value = 10 s, default value = 180 s).
 #service_request_timeout = 180
 
-# The maximum simultaneous comms RPC sessions allowed. Setting this to -1 will allow unlimited sessions.
-# rpc_max_simultaneous_sessions = 1000
+# The maximum simultaneous comms RPC sessions allowed (default value = 1000). Setting this to -1 will allow unlimited
+# sessions.
+rpc_max_simultaneous_sessions = 10000
 
 # Auto Update
 #
@@ -116,20 +117,33 @@ console_wallet_db_file = "wallet/console-wallet.dat"
 
 # This is the timeout period that will be used to monitor TXO queries to the base node (default = 60). Larger values
 # are needed for wallets with many (>1000) TXOs to be validated.
-base_node_query_timeout = 120
+base_node_query_timeout = 180
 # The amount of seconds added to the current time (Utc) which will then be used to check if the message has
 # expired or not when processing the message (default = 10800).
 #saf_expiry_duration = 10800
-# This is the number of block confirmations required for a transaction to be considered completely mined and confirmed. (default = 3)
+# This is the number of block confirmations required for a transaction to be considered completely mined and
+# confirmed. (default = 3)
 #transaction_num_confirmations_required = 3
 # This is the timeout period that will be used for base node broadcast monitoring tasks (default = 60)
-#transaction_broadcast_monitoring_timeout = 60
+transaction_broadcast_monitoring_timeout = 180
 # This is the timeout period that will be used for chain monitoring tasks (default = 60)
 #transaction_chain_monitoring_timeout = 60
 # This is the timeout period that will be used for sending transactions directly (default = 20)
-#transaction_direct_send_timeout = 20
+transaction_direct_send_timeout = 180
 # This is the timeout period that will be used for sending transactions via broadcast mode (default = 60)
-#transaction_broadcast_send_timeout = 60
+transaction_broadcast_send_timeout = 180
+# This is the size of the event channel used to communicate transaction status events to the wallet's UI. A busy console
+# wallet doing thousands of bulk payments or used for stress testing needs a fairly big size (>10000) (default = 1000).
+transaction_event_channel_size = 25000
+# This is the size of the event channel used to communicate base node events to the wallet. A busy console
+# wallet doing thousands of bulk payments or used for stress testing needs a fairly big size (>3000) (default = 250).
+base_node_event_channel_size = 3500
+# This is the size of the event channel used to communicate output manager events to the wallet. A busy console
+# wallet doing thousands of bulk payments or used for stress testing needs a fairly big size (>3000) (default = 250).
+output_manager_event_channel_size = 3500
+# This is the size of the event channel used to communicate base node update events to the wallet. A busy console
+# wallet doing thousands of bulk payments or used for stress testing needs a fairly big size (>300) (default = 50).
+base_node_update_publisher_channel_size = 500
 # If a large amount of tiny valued uT UTXOs are used as inputs to a transaction, the fee may be larger than
 # the transaction amount. Set this value to `false` to allow spending of "dust" UTXOs for small valued
 # transactions (default = true).
@@ -140,7 +154,7 @@ base_node_query_timeout = 120
 #transaction_routing_mechanism = "DirectAndStoreAndForward"
 
 # UTXO scanning service interval (default = 12 hours, i.e. 60 * 60 * 12 seconds)
-scan_for_utxo_interval = 60
+scan_for_utxo_interval = 180
 
 # When running the console wallet in command mode, use these values to determine what "stage" and timeout to wait
 # for sent transactions.
@@ -151,7 +165,7 @@ scan_for_utxo_interval = 60
 # - "MinedUnconfirmed" - The transaction was successfully detected as mined but unconfirmed on the blockchain.
 # - "Mined" - The transaction was successfully detected as mined and confirmed on the blockchain.
 
-# The default values are:
+# The default values are: "Broadcast", 300
 #command_send_wait_stage = "Broadcast"
 #command_send_wait_timeout = 300
 
@@ -161,9 +175,9 @@ scan_for_utxo_interval = 60
 
 # Configuration for the wallet's base node service
 # The refresh interval, defaults to 10 seconds
-# base_node_service_refresh_interval = 10
+base_node_service_refresh_interval = 30
 # The maximum age of service requests in seconds, requests older than this are discarded
-# base_node_service_request_max_age = 60
+base_node_service_request_max_age = 180
 
 #[base_node.transport.tor]
 #control_address = "/ip4/127.0.0.1/tcp/9051"
@@ -253,6 +267,10 @@ db_type = "lmdb"
 # is "0", which indicates an archival node without any pruning.
 #pruning_horizon = 0
 
+# The amount of messages that will be permitted in the flood ban timespan of 100s (Default weatherwax = 1000,
+# default mainnet = 10000)
+flood_ban_max_msg_count = 10000
+
 # The relative path to store persistent data
 data_dir = "weatherwax"
 
@@ -464,9 +482,10 @@ console_wallet_tor_identity_file = "config/console_wallet_tor.json"
 [merge_mining_proxy.weatherwax]
 
 # URL to monerod
-monerod_url = "http://monero-stagenet.exan.tech:38081" # stagenet
-#monerod_url = "http://18.133.59.45:28081"  # testnet
-#monerod_url = "http://18.132.124.81:18081" # mainnet
+monerod_url = "http://monero-stagenet.exan.tech:38081"  # stagenet
+#monerod_url = "http://18.133.59.45:28081"               # testnet
+#monerod_url = "http://18.132.124.81:18081"              # mainnet
+#monerod_url = "http://monero.exan.tech:18081"           # mainnet alternative
 
 # Address of the tari_merge_mining_proxy application
 proxy_host_address = "127.0.0.1:7878"
diff --git a/common/src/configuration/global.rs b/common/src/configuration/global.rs
index d08752239c..d07ab410be 100644
--- a/common/src/configuration/global.rs
+++ b/common/src/configuration/global.rs
@@ -82,7 +82,6 @@ pub struct GlobalConfig {
     pub dns_seeds_name_server: SocketAddr,
     pub dns_seeds_use_dnssec: bool,
     pub peer_db_path: PathBuf,
-    pub enable_wallet: bool,
     pub num_mining_threads: usize,
     pub base_node_tor_identity_file: PathBuf,
     pub wallet_db_file: PathBuf,
@@ -92,9 +91,9 @@ pub struct GlobalConfig {
     pub wallet_peer_db_path: PathBuf,
     pub console_wallet_peer_db_path: PathBuf,
     pub buffer_size_base_node: usize,
-    pub buffer_size_base_node_wallet: usize,
+    pub buffer_size_console_wallet: usize,
     pub buffer_rate_limit_base_node: usize,
-    pub buffer_rate_limit_base_node_wallet: usize,
+    pub buffer_rate_limit_console_wallet: usize,
     pub dedup_cache_capacity: usize,
     pub fetch_blocks_timeout: Duration,
     pub fetch_utxos_timeout: Duration,
@@ -108,6 +107,10 @@ pub struct GlobalConfig {
     pub transaction_broadcast_send_timeout: Duration,
     pub transaction_routing_mechanism: String,
     pub transaction_num_confirmations_required: u64,
+    pub transaction_event_channel_size: usize,
+    pub base_node_event_channel_size: usize,
+    pub output_manager_event_channel_size: usize,
+    pub base_node_update_publisher_channel_size: usize,
     pub console_wallet_password: Option<String>,
     pub wallet_command_send_wait_stage: String,
     pub wallet_command_send_wait_timeout: u64,
@@ -390,12 +393,6 @@ fn convert_node_config(
     let wallet_peer_db_path = data_dir.join("wallet_peer_db");
     let console_wallet_peer_db_path = data_dir.join("console_wallet_peer_db");
 
-    // set base node wallet
-    let key = config_string("base_node", &net_str, "enable_wallet");
-    let enable_wallet = cfg
-        .get_bool(&key)
-        .map_err(|e| ConfigurationError::new(&key, &e.to_string()))?;
-
     let key = config_string("base_node", &net_str, "flood_ban_max_msg_count");
     let flood_ban_max_msg_count = cfg
         .get_int(&key)
@@ -476,6 +473,18 @@ fn convert_node_config(
     let key = "wallet.transaction_num_confirmations_required";
     let transaction_num_confirmations_required = optional(cfg.get_int(&key))?.unwrap_or(3) as u64;
 
+    let key = "wallet.transaction_event_channel_size";
+    let transaction_event_channel_size = optional(cfg.get_int(&key))?.unwrap_or(1000) as usize;
+
+    let key = "wallet.base_node_event_channel_size";
+    let base_node_event_channel_size = optional(cfg.get_int(&key))?.unwrap_or(250) as usize;
+
+    let key = "wallet.output_manager_event_channel_size";
+    let output_manager_event_channel_size = optional(cfg.get_int(&key))?.unwrap_or(250) as usize;
+
+    let key = "wallet.base_node_update_publisher_channel_size";
+    let base_node_update_publisher_channel_size = optional(cfg.get_int(&key))?.unwrap_or(50) as usize;
+
     let key = "wallet.prevent_fee_gt_amount";
     let prevent_fee_gt_amount = cfg
         .get_bool(&key)
@@ -552,8 +561,8 @@ fn convert_node_config(
         .get_int(&key)
         .map_err(|e| ConfigurationError::new(&key, &e.to_string()))? as usize;
 
-    let key = "common.buffer_size_base_node_wallet";
-    let buffer_size_base_node_wallet = cfg
+    let key = "common.buffer_size_console_wallet";
+    let buffer_size_console_wallet = cfg
         .get_int(&key)
         .map_err(|e| ConfigurationError::new(&key, &e.to_string()))? as usize;
 
@@ -562,8 +571,8 @@ fn convert_node_config(
         .get_int(&key)
         .map_err(|e| ConfigurationError::new(&key, &e.to_string()))? as usize;
 
-    let key = "common.buffer_rate_limit_base_node_wallet";
-    let buffer_rate_limit_base_node_wallet =
+    let key = "common.buffer_rate_limit_console_wallet";
+    let buffer_rate_limit_console_wallet =
         cfg.get_int(&key)
             .map_err(|e| ConfigurationError::new(&key, &e.to_string()))? as usize;
 
@@ -706,7 +715,6 @@ fn convert_node_config(
         dns_seeds_name_server,
         dns_seeds_use_dnssec,
         peer_db_path,
-        enable_wallet,
         num_mining_threads,
         base_node_tor_identity_file,
         console_wallet_identity_file,
@@ -716,9 +724,9 @@ fn convert_node_config(
         wallet_peer_db_path,
         console_wallet_peer_db_path,
         buffer_size_base_node,
-        buffer_size_base_node_wallet,
+        buffer_size_console_wallet,
         buffer_rate_limit_base_node,
-        buffer_rate_limit_base_node_wallet,
+        buffer_rate_limit_console_wallet,
         dedup_cache_capacity,
         fetch_blocks_timeout,
         fetch_utxos_timeout,
@@ -732,6 +740,10 @@ fn convert_node_config(
         transaction_broadcast_send_timeout,
         transaction_routing_mechanism,
         transaction_num_confirmations_required,
+        transaction_event_channel_size,
+        base_node_event_channel_size,
+        output_manager_event_channel_size,
+        base_node_update_publisher_channel_size,
         console_wallet_password,
         wallet_command_send_wait_stage,
         wallet_command_send_wait_timeout,
diff --git a/common/src/configuration/utils.rs b/common/src/configuration/utils.rs
index 13dfdf0ab2..edc65e5967 100644
--- a/common/src/configuration/utils.rs
+++ b/common/src/configuration/utils.rs
@@ -61,9 +61,9 @@ pub fn default_config(bootstrap: &ConfigBootstrap) -> Config {
     cfg.set_default("common.liveness_max_sessions", 0).unwrap();
     cfg.set_default("common.denylist_ban_period", 1440).unwrap();
     cfg.set_default("common.buffer_size_base_node", 1_500).unwrap();
-    cfg.set_default("common.buffer_size_base_node_wallet", 50_000).unwrap();
+    cfg.set_default("common.buffer_size_console_wallet", 50_000).unwrap();
     cfg.set_default("common.buffer_rate_limit_base_node", 1_000).unwrap();
-    cfg.set_default("common.buffer_rate_limit_base_node_wallet", 1_000)
+    cfg.set_default("common.buffer_rate_limit_console_wallet", 1_000)
         .unwrap();
     cfg.set_default("common.dedup_cache_capacity", 2_500).unwrap();
     cfg.set_default("common.fetch_blocks_timeout", 150).unwrap();
@@ -172,7 +172,6 @@ pub fn default_config(bootstrap: &ConfigBootstrap) -> Config {
         .unwrap();
     cfg.set_default("base_node.mainnet.grpc_console_wallet_address", "127.0.0.1:18143")
         .unwrap();
-    cfg.set_default("base_node.mainnet.enable_wallet", true).unwrap();
     cfg.set_default("base_node.mainnet.flood_ban_max_msg_count", 10000)
         .unwrap();
 
@@ -228,7 +227,6 @@ pub fn default_config(bootstrap: &ConfigBootstrap) -> Config {
         .unwrap();
     cfg.set_default("base_node.weatherwax.grpc_console_wallet_address", "127.0.0.1:18143")
         .unwrap();
-    cfg.set_default("base_node.weatherwax.enable_wallet", true).unwrap();
 
     cfg.set_default("base_node.weatherwax.dns_seeds_name_server", "1.1.1.1:53")
         .unwrap();
diff --git a/comms/src/protocol/rpc/handshake.rs b/comms/src/protocol/rpc/handshake.rs
index 0bc75c0fa4..696135a52e 100644
--- a/comms/src/protocol/rpc/handshake.rs
+++ b/comms/src/protocol/rpc/handshake.rs
@@ -66,7 +66,7 @@ where T: AsyncRead + AsyncWrite + Unpin
         Self { framed, timeout: None }
     }
 
-    /// Set the length of time that a client/server should wait for the other side to response before timing out.
+    /// Set the length of time that a client/server should wait for the other side to respond before timing out.
     pub fn with_timeout(mut self, timeout: Duration) -> Self {
         self.timeout = Some(timeout);
         self
diff --git a/integration_tests/helpers/util.js b/integration_tests/helpers/util.js
index 46a4d7cdc1..b72984051c 100644
--- a/integration_tests/helpers/util.js
+++ b/integration_tests/helpers/util.js
@@ -99,7 +99,7 @@ async function waitFor(
     } catch (e) {
       if (i > 1) {
         if (e && e.code && e.code === NO_CONNECTION) {
-          //console.log("No connection yet (waitFor)...");
+          // console.log("No connection yet (waitFor)...");
         } else {
           console.error("Error in waitFor: ", e);
         }