diff --git a/core/src/main/java/io/bitsquare/btc/WalletService.java b/core/src/main/java/io/bitsquare/btc/WalletService.java
index f012f857b1..061cb9e4eb 100644
--- a/core/src/main/java/io/bitsquare/btc/WalletService.java
+++ b/core/src/main/java/io/bitsquare/btc/WalletService.java
@@ -370,7 +370,7 @@ public class WalletService {
         List<TransactionConfidence> transactionConfidenceList = new ArrayList<>();
 
         mergedOutputs.stream().filter(e -> e.getScriptPubKey().isSentToAddress() ||
-                e.getScriptPubKey().isSentToP2SH()).forEach(transactionOutput -> {
+                e.getScriptPubKey().isPayToScriptHash()).forEach(transactionOutput -> {
             Address outputAddress = transactionOutput.getScriptPubKey().getToAddress(params);
             if (address.equals(outputAddress)) {
                 transactionConfidenceList.add(tx.getConfidence());
@@ -440,12 +440,10 @@ public class WalletService {
     private Coin getBalance(LinkedList<TransactionOutput> transactionOutputs, Address address) {
         Coin balance = Coin.ZERO;
         for (TransactionOutput transactionOutput : transactionOutputs) {
-            if (transactionOutput.getScriptPubKey().isSentToAddress() || transactionOutput.getScriptPubKey()
-                    .isSentToP2SH()) {
+            if (transactionOutput.getScriptPubKey().isSentToAddress() || transactionOutput.getScriptPubKey().isPayToScriptHash()) {
                 Address addressOutput = transactionOutput.getScriptPubKey().getToAddress(params);
-                if (addressOutput.equals(address)) {
+                if (addressOutput.equals(address)) 
                     balance = balance.add(transactionOutput.getValue());
-                }
             }
         }
         return balance;
@@ -795,7 +793,7 @@ public class WalletService {
 
         verifyTransaction(depositTx);
         checkWalletConsistency();
-        checkScriptSigForAllInputs(depositTx);
+        //checkScriptSigForAllInputs(depositTx);
 
         // Broadcast depositTx
         log.trace("Wallet balance before broadcastTransaction: " + wallet.getBalance());
@@ -1017,9 +1015,8 @@ public class WalletService {
 
     private void checkScriptSig(Transaction transaction, TransactionInput input, int inputIndex) throws TransactionVerificationException {
         try {
-            log.trace("Verifies that this script (interpreted as a scriptSig) correctly spends the given scriptPubKey.");
+            log.trace("Verifies that this script (interpreted as a scriptSig) correctly spends the given scriptPubKey. Check input at index: " + inputIndex);
             input.getScriptSig().correctlySpends(transaction, inputIndex, input.getConnectedOutput().getScriptPubKey());
-            inputIndex++;
         } catch (Throwable t) {
             t.printStackTrace();
             log.error(t.getMessage());
@@ -1027,12 +1024,13 @@ public class WalletService {
         }
     }
 
-    private void checkScriptSigForAllInputs(Transaction transaction) throws TransactionVerificationException {
+    /*private void checkScriptSigForAllInputs(Transaction transaction) throws TransactionVerificationException {
         int inputIndex = 0;
         for (TransactionInput input : transaction.getInputs()) {
             checkScriptSig(transaction, input, inputIndex);
+            inputIndex++;
         }
-    }
+    }*/
 
     private void removeSignatures(Transaction transaction) throws InsufficientMoneyException {
         for (TransactionInput input : transaction.getInputs()) {
diff --git a/core/src/main/java/io/bitsquare/trade/TradeManager.java b/core/src/main/java/io/bitsquare/trade/TradeManager.java
index 9db6cbd408..fa58aba9d4 100644
--- a/core/src/main/java/io/bitsquare/trade/TradeManager.java
+++ b/core/src/main/java/io/bitsquare/trade/TradeManager.java
@@ -213,6 +213,7 @@ public class TradeManager {
                 case OPEN:
                     break;
                 case OFFERER_ACCEPTED:
+                case TAKE_OFFER_FEE_PAID:
                 case DEPOSIT_PUBLISHED:
                 case DEPOSIT_CONFIRMED:
                 case FIAT_PAYMENT_STARTED:
diff --git a/core/src/main/resources/logback.xml b/core/src/main/resources/logback.xml
index 3aa274749b..8316c12ef5 100644
--- a/core/src/main/resources/logback.xml
+++ b/core/src/main/resources/logback.xml
@@ -29,18 +29,22 @@
     </root>
 
     <logger name="io.bitsquare" level="TRACE"/>
-    <logger name="io.bitsquare.network.tomp2p.BootstrappedPeerBuilder" level="ERROR"/>
     <logger name="io.bitsquare.gui.util.Profiler" level="ERROR"/>
     <logger name="io.bitsquare.persistence.Persistence" level="ERROR"/>
     <logger name="io.bitsquare.locale.BSResources" level="ERROR"/>
-    
-    <logger name="org.bitcoinj" level="TRACE"/>
+
+    <logger name="org.bitcoinj" level="DEBUG"/>
     <logger name="net.tomp2p" level="ERROR"/>
-    <logger name="com.vinumeris.updatefx" level="OFF"/>
-    <logger name="io.netty" level="OFF"/>
-    <logger name="org.bitcoinj.core.BitcoinSerializer" level="ERROR"/>
-    <logger name="org.bitcoinj.core.Peer" level="ERROR"/>
+
+    <logger name="org.bitcoinj.core.BitcoinSerializer" level="WARN"/>
+    <logger name="org.bitcoinj.core.Peer" level="WARN"/>
     
+    <!-- 
+   <logger name="com.vinumeris.updatefx" level="OFF"/>
+   <logger name="io.netty" level="OFF"/>
+   <logger name="org.bitcoinj.core.BitcoinSerializer" level="ERROR"/>
+   <logger name="org.bitcoinj.core.Peer" level="ERROR"/>-->
+
     <!-- <logger name="net.tomp2p.message.Encoder" level="WARN"/>
      <logger name="net.tomp2p.message.Decoder" level="WARN"/>
      <logger name="net.tomp2p.message.MessageHeaderCodec" level="WARN"/>
@@ -50,12 +54,10 @@
      <logger name="io.netty.channel" level="WARN"/>
      <logger name="io.netty.buffer" level="WARN"/>-->
 
-   
 
-
-   <!-- <logger name="org.bitcoinj.core.BitcoinSerializer" level="WARN"/>
-    <logger name="org.bitcoinj.core.AbstractBlockChain" level="WARN"/>
-    <logger name="org.bitcoinj.wallet.DeterministicKeyChain" level="WARN"/>-->
+    <!-- <logger name="org.bitcoinj.core.BitcoinSerializer" level="WARN"/>
+     <logger name="org.bitcoinj.core.AbstractBlockChain" level="WARN"/>
+     <logger name="org.bitcoinj.wallet.DeterministicKeyChain" level="WARN"/>-->
     <!-- <logger name="io.bitsquare.btc.WalletService" level="WARN"/>-->
 
     <!--