diff --git a/iguana/exchanges/LP_nativeDEX.c b/iguana/exchanges/LP_nativeDEX.c
index e3875a70a..0f12bd976 100644
--- a/iguana/exchanges/LP_nativeDEX.c
+++ b/iguana/exchanges/LP_nativeDEX.c
@@ -617,7 +617,7 @@ void LP_coinsloop(void *_coins)
                     coin->lastscanht = coin->firstscanht;
                 continue;
             }
-            if ( 1 )
+            if ( 0 )
             {
                 nonz++;
                 if ( strcmp("BTC",coins) == 0 )//&& coin->lastscanht < coin->longestchain-3 )
@@ -1223,11 +1223,6 @@ void LPinit(uint16_t myport,uint16_t mypullport,uint16_t mypubport,uint16_t mybu
         printf("error launching LP_tradessloop for ctx.%p\n",ctx);
         exit(-1);
     }
-    /*if ( 0 && OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_privkeysloop,ctx) != 0 )
-    {
-        printf("error launching LP_privkeysloop for ctx.%p\n",ctx);
-        exit(-1);
-    }*/
     if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_swapsloop,ctx) != 0 )
     {
         printf("error launching LP_swapsloop for ctx.%p\n",ctx);
diff --git a/iguana/exchanges/LP_ordermatch.c b/iguana/exchanges/LP_ordermatch.c
index 850a5e255..3db0881a8 100644
--- a/iguana/exchanges/LP_ordermatch.c
+++ b/iguana/exchanges/LP_ordermatch.c
@@ -504,6 +504,7 @@ int32_t LP_connectstartbob(void *ctx,int32_t pubsock,char *base,char *rel,double
                 }
                 LP_reserved_msg(0,base,rel,zero,jprint(reqjson,0));
                 free_json(reqjson);
+                LP_importaddress(qp->destcoin,qp->destaddr);
                 retval = 0;
             } else printf("error launching swaploop\n");
         } else printf("couldnt bind to any port %s\n",pairstr);
@@ -654,6 +655,7 @@ char *LP_connectedalice(struct LP_quoteinfo *qp,char *pairstr) // alice
             swap->N.pair = pairsock;
             //autxo->S.swap = swap;
             //swap->utxo = autxo;
+            LP_importaddress(qp->srccoin,qp->coinaddr);
             LP_aliceid(qp->tradeid,qp->aliceid,"started",qp->R.requestid,qp->R.quoteid);
             printf("alice pairstr.(%s) pairsock.%d pthread_t %ld\n",pairstr,pairsock,sizeof(pthread_t));
             if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_aliceloop,(void *)swap) == 0 )
diff --git a/iguana/exchanges/LP_remember.c b/iguana/exchanges/LP_remember.c
index 9a4eacd20..b7a6ea3d1 100644
--- a/iguana/exchanges/LP_remember.c
+++ b/iguana/exchanges/LP_remember.c
@@ -243,6 +243,7 @@ bits256 basilisk_swap_privbob_extract(char *symbol,bits256 spendtxid,int32_t vin
 bits256 basilisk_swap_privBn_extract(bits256 *bobrefundp,char *bobcoin,bits256 bobdeposit,bits256 privBn)
 {
     char destaddr[64];
+    destaddr[0] = 0;
     if ( bits256_nonz(privBn) == 0 )
     {
         if ( bits256_nonz(bobdeposit) != 0 )
@@ -253,10 +254,11 @@ bits256 basilisk_swap_privBn_extract(bits256 *bobrefundp,char *bobcoin,bits256 b
     return(privBn);
 }
 
-bits256 basilisk_swap_spendupdate(int32_t iambob,char *symbol,char *spentaddr,int32_t *sentflags,bits256 *txids,int32_t utxoind,int32_t alicespent,int32_t bobspent,int32_t vout,char *aliceaddr,char *bobaddr,char *Adest,char *dest)
+bits256 basilisk_swap_spendupdate(int32_t iambob,char *symbol,char *spentaddr,int32_t *sentflags,bits256 *txids,int32_t utxoind,int32_t alicespent,int32_t bobspent,int32_t utxovout,char *aliceaddr,char *bobaddr,char *Adest,char *dest)
 {
-    bits256 spendtxid,txid; char destaddr[64],str[65]; int32_t i,n,m; struct iguana_info *coin; cJSON *array,*txobj,*vins,*vin;
+    bits256 spendtxid,txid; char destaddr[64],str[65]; int32_t i,n; struct iguana_info *coin; cJSON *array,*txobj;
     memset(&spendtxid,0,sizeof(spendtxid));
+    destaddr[0] = 0;
     if ( (coin= LP_coinfind(symbol)) == 0 )
         return(spendtxid);
     //printf("spentaddr.%s aliceaddr.%s bobaddr.%s Adest.%s Bdest.%s\n",spentaddr,aliceaddr,bobaddr,Adest,dest);
@@ -272,16 +274,8 @@ bits256 basilisk_swap_spendupdate(int32_t iambob,char *symbol,char *spentaddr,in
                     //printf("i.%d of %d: %s\n",i,n,bits256_str(str,txid));
                     if ( bits256_cmp(txid,txids[utxoind]) != 0 )
                     {
-                        if ( (txobj= LP_gettx(symbol,txid,1)) != 0 )
-                        {
-                            //printf("txobj.(%s)\n",jprint(txobj,0));
-                            if ( (vins= jarray(&m,txobj,"vin")) != 0 )
-                            {
-                                vin = jitem(vins,0);
-                                //printf("vin0.(%s)\n",jprint(vin,0));
-                            }
+                        if ( (txobj= LP_gettx(symbol,txid,1)) != 0 ) // good side effects
                             free_json(txobj);
-                        }
                     }
                 }
             }
@@ -289,11 +283,16 @@ bits256 basilisk_swap_spendupdate(int32_t iambob,char *symbol,char *spentaddr,in
             free_json(array);
         }
     }
+    else
+    {
+        if ( iambob != 0 )
+            strcpy(destaddr,aliceaddr);
+        else strcpy(destaddr,bobaddr);
+    }
     txid = txids[utxoind];
     if ( bits256_nonz(txid) != 0 )//&& sentflags[utxoind] != 0 )
     {
-        destaddr[0] = 0;
-        spendtxid = LP_swap_spendtxid(symbol,destaddr,txid,vout);
+        spendtxid = LP_swap_spendtxid(symbol,destaddr,txid,utxovout);
         if ( bits256_nonz(spendtxid) != 0 )
         {
             sentflags[utxoind] = 1;
diff --git a/iguana/exchanges/LP_statemachine.c b/iguana/exchanges/LP_statemachine.c
index c8e3988a5..3855c789f 100644
--- a/iguana/exchanges/LP_statemachine.c
+++ b/iguana/exchanges/LP_statemachine.c
@@ -468,6 +468,11 @@ void LP_instantdex_txidadd(bits256 txid)
     if ( array != 0 )
         free_json(array);
 }
+/*if ( 0 && OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)LP_privkeysloop,ctx) != 0 )
+ {
+ printf("error launching LP_privkeysloop for ctx.%p\n",ctx);
+ exit(-1);
+ }*/
 
 char *issue_LP_getprices(char *destip,uint16_t destport)
 {
diff --git a/iguana/exchanges/LP_transaction.c b/iguana/exchanges/LP_transaction.c
index 9a2f8cf4a..2355e04e9 100644
--- a/iguana/exchanges/LP_transaction.c
+++ b/iguana/exchanges/LP_transaction.c
@@ -1638,25 +1638,55 @@ bits256 _LP_swap_spendtxid(char *symbol,char *destaddr,char *coinaddr,bits256 ut
 }
 #endif
 
-bits256 LP_swap_spendtxid(char *symbol,char *destaddr,bits256 utxotxid,int32_t vout)
+bits256 LP_swap_spendtxid(char *symbol,char *destaddr,bits256 utxotxid,int32_t utxovout)
 {
-    bits256 spendtxid; int32_t spendvin; char coinaddr[64],str[65]; cJSON *retjson; struct iguana_info *coin;
+    bits256 spendtxid,txid,vintxid; int32_t spendvin,i,m,n; char coinaddr[64]; cJSON *array,*vins,*vin,*txobj; struct iguana_info *coin;
     // listtransactions or listspents
-    destaddr[0] = 0;
     coinaddr[0] = 0;
     memset(&spendtxid,0,sizeof(spendtxid));
-    if ( LP_spendsearch(destaddr,&spendtxid,&spendvin,symbol,utxotxid,vout) > 0 )
+    if ( LP_spendsearch(destaddr,&spendtxid,&spendvin,symbol,utxotxid,utxovout) > 0 )
     {
         //printf("spend of %s/v%d detected\n",bits256_str(str,utxotxid),vout);
     }
-    else if ( 0 && (coin= LP_coinfind(symbol)) != 0 && coin->electrum == 0 )
+    else if ( (coin= LP_coinfind(symbol)) != 0 && coin->electrum == 0 )
     {
-        if ( (retjson= LP_gettxout(symbol,coinaddr,utxotxid,vout)) == 0 )
+        if ( (array= LP_listreceivedbyaddress(symbol,destaddr)) != 0 )
         {
-            decode_hex(spendtxid.bytes,32,"deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef");
-            printf("couldnt find spend of %s/v%d, but no gettxout\n",bits256_str(str,utxotxid),vout);
-        } else free_json(retjson);
+            if ( (n= cJSON_GetArraySize(array)) > 0 )
+            {
+                for (i=0; i<n; i++)
+                {
+                    txid = jbits256i(array,i);
+                    if ( (txobj= LP_gettx(symbol,txid,1)) != 0 )
+                    {
+                        //printf("txobj.(%s)\n",jprint(txobj,0));
+                        if ( (vins= jarray(&m,txobj,"vin")) != 0 )
+                        {
+                            if ( utxovout < m )
+                            {
+                                vin = jitem(vins,utxovout);
+                                vintxid = jbits256(vin,"txid");
+                                if ( bits256_cmp(vintxid,utxotxid) == 0 )
+                                {
+                                    LP_txdestaddr(destaddr,txid,0,txobj);
+                                    spendtxid = txid;
+                                }
+                                char str[65],str2[65],str3[65]; printf("LP_swap_spendtxid: in %s/v%d spends %s vs %s found.%d destaddr.(%s)\n",bits256_str(str,txid),utxovout,bits256_str(str2,vintxid),bits256_str(str3,utxotxid),bits256_cmp(vintxid,utxotxid) == 0,destaddr);
+                            }
+                        }
+                        free_json(txobj);
+                    }
+                }
+            }
+            free_json(array);
+        }
     }
+    /*   if ( (retjson= LP_gettxout(symbol,coinaddr,utxotxid,vout)) == 0 )
+     {
+     decode_hex(spendtxid.bytes,32,"deadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef");
+     printf("couldnt find spend of %s/v%d, but no gettxout\n",bits256_str(str,utxotxid),vout);
+     } else free_json(retjson);
+     */
     return(spendtxid);
     //char str[65]; printf("swap %s spendtxid.(%s)\n",symbol,bits256_str(str,utxotxid));
 }
@@ -2034,7 +2064,7 @@ int32_t LP_verify_otherfee(struct basilisk_swap *swap,uint8_t *data,int32_t data
                 diff = swap->otherfee.I.locktime - (swap->I.started+1);
                 if ( diff < 0 )
                     diff = -diff;
-                if ( diff < 10 )
+                if ( diff < LP_AUTOTRADE_TIMEOUT )
                     printf("dexfee verified\n");
                 else printf("locktime mismatch in otherfee, reject %u vs %u\n",swap->otherfee.I.locktime,swap->I.started+1);
                 return(0);