diff --git a/src/bin/makerd.rs b/src/bin/makerd.rs
index 20521255..cb172f34 100644
--- a/src/bin/makerd.rs
+++ b/src/bin/makerd.rs
@@ -8,8 +8,10 @@ use coinswap::{
 use std::{path::PathBuf, sync::Arc};
 /// Coinswap Maker Server
 ///
-/// The server requires a Bitcoin Core RPC connection running in Signet. It requires some starting balance, arounbd 0.05 BTC Fidelity + Swap Liquidity (suggested 0.05 BTC).
-/// After succesful creation of Fidelity Bond, the server will start listinening for incoimng swap requests and earn swap fees.
+/// The server requires a Bitcoin Core RPC connection running in Signet. It requires some starting balance, around 50,000 sats for Fidelity + Swap Liquidity (suggested 50,000 sats).
+/// So topup with at least 0.01 BTC to start all the node processses. Suggested faucet: https://signetfaucet.com/
+/// All server process will start after the fidelity bond transaction confirms. This may take some time. Approx: 10 mins.
+/// Once the bond confirms, the server starts listening for incoming swap requests. As it performs swaps for clients, it keeps earning fees.
 ///
 /// The server is operated with the maker-cli app, for all basic wallet related operations.
 ///
diff --git a/src/bin/taker.rs b/src/bin/taker.rs
index 5d491f4d..c749daff 100644
--- a/src/bin/taker.rs
+++ b/src/bin/taker.rs
@@ -90,7 +90,7 @@ enum Commands {
         /// Adding more makers in the swap will incure more swap fees.
         #[clap(long, short = 'm', default_value = "2")]
         makers: usize,
-        /// Sets the send amount.
+        /// Sets the send amount in sats.
         #[clap(long, short = 'a', default_value = "20000")]
         amount: u64,
         /// Sets how many utxos to swap.
diff --git a/src/maker/api.rs b/src/maker/api.rs
index 4488753e..f6e35689 100644
--- a/src/maker/api.rs
+++ b/src/maker/api.rs
@@ -100,7 +100,7 @@ pub const AMOUNT_RELATIVE_FEE_PCT: f64 = 2.50;
 pub const TIME_RELATIVE_FEE_PCT: f64 = 0.10;
 
 /// Minimum Coinswap amount; makers will not accept amounts below this.
-pub const MIN_SWAP_AMOUNT: u64 = 100000;
+pub const MIN_SWAP_AMOUNT: u64 = 10_000;
 
 // What's the use of RefundLocktimeStep?
 
diff --git a/src/maker/config.rs b/src/maker/config.rs
index ec51c382..9c0c8212 100644
--- a/src/maker/config.rs
+++ b/src/maker/config.rs
@@ -38,8 +38,14 @@ impl Default for MakerConfig {
             min_swap_amount: MIN_SWAP_AMOUNT,
             socks_port: 19050,
             directory_server_address: "127.0.0.1:8080".to_string(),
-            fidelity_amount: 5_000_000, // 0.05 BTC
-            fidelity_timelock: 26_000,  // Approx 6 months of blocks
+            #[cfg(feature = "integration-test")]
+            fidelity_amount: 5_000_000, // 0.05 BTC for tests
+            #[cfg(feature = "integration-test")]
+            fidelity_timelock: 26_000, // Approx 6 months of blocks for test
+            #[cfg(not(feature = "integration-test"))]
+            fidelity_amount: 50_000, // 50K sats for production
+            #[cfg(not(feature = "integration-test"))]
+            fidelity_timelock: 2160, // Approx 15 days of blocks in production
             connection_type: {
                 #[cfg(feature = "tor")]
                 {