diff --git a/cw_monero/lib/api/coins_info.dart b/cw_monero/lib/api/coins_info.dart
index c1b634cc6..ef7d3cfd6 100644
--- a/cw_monero/lib/api/coins_info.dart
+++ b/cw_monero/lib/api/coins_info.dart
@@ -12,6 +12,18 @@ int countOfCoins() => monero.Coins_count(coins!);
 
 monero.CoinsInfo getCoin(int index) => monero.Coins_coin(coins!, index);
 
+int? getCoinByKeyImage(String keyImage) {
+  final count = countOfCoins();
+  for (int i = 0; i < count; i++) {
+    final coin = getCoin(i);
+    final coinAddress = monero.CoinsInfo_keyImage(coin);
+    if (keyImage == coinAddress) {
+      return i;
+    }
+  }
+  return null;
+}
+
 void freezeCoin(int index) => monero.Coins_setFrozen(coins!, index: index);
 
 void thawCoin(int index) => monero.Coins_thaw(coins!, index: index);
diff --git a/cw_monero/lib/api/transaction_history.dart b/cw_monero/lib/api/transaction_history.dart
index a308b682e..89bcea800 100644
--- a/cw_monero/lib/api/transaction_history.dart
+++ b/cw_monero/lib/api/transaction_history.dart
@@ -13,7 +13,9 @@ import 'package:mutex/mutex.dart';
 
 
 String getTxKey(String txId) {
-  return monero.Wallet_getTxKey(wptr!, txid: txId);
+  final ret = monero.Wallet_getTxKey(wptr!, txid: txId);
+  monero.Wallet_status(wptr!);
+  return ret;
 }
 final txHistoryMutex = Mutex();
 monero.TransactionHistory? txhistory;
@@ -87,7 +89,9 @@ Future<PendingTransactionDescription> createTransactionSync(
   final amt = amount == null ? 0 : monero.Wallet_amountFromString(amount);
   
   final address_ = address.toNativeUtf8(); 
-  final paymentId_ = paymentId.toNativeUtf8(); 
+  final paymentId_ = paymentId.toNativeUtf8();
+  print("inputs: $preferredInputs");
+
   final preferredInputs_ = preferredInputs.join(monero.defaultSeparatorStr).toNativeUtf8();
 
   final waddr = wptr!.address;
diff --git a/cw_monero/lib/api/wallet.dart b/cw_monero/lib/api/wallet.dart
index 8e03cff3e..422acf126 100644
--- a/cw_monero/lib/api/wallet.dart
+++ b/cw_monero/lib/api/wallet.dart
@@ -4,6 +4,7 @@ import 'dart:isolate';
 
 import 'package:cw_monero/api/account_list.dart';
 import 'package:cw_monero/api/exceptions/setup_wallet_exception.dart';
+import 'package:flutter/foundation.dart';
 import 'package:monero/monero.dart' as monero;
 import 'package:mutex/mutex.dart';
 
@@ -119,7 +120,6 @@ Future<bool> setupNodeSync(
         daemonUsername: login ?? '',
         daemonPassword: password ?? '');
   });
-  // monero.Wallet_init3(wptr!, argv0: '', defaultLogBaseName: 'moneroc', console: true);
 
   final status = monero.Wallet_status(wptr!);
 
@@ -129,6 +129,15 @@ Future<bool> setupNodeSync(
     throw SetupWalletException(message: error);
   }
 
+  if (kDebugMode) {
+    monero.Wallet_init3(
+      wptr!, argv0: '',
+      defaultLogBaseName: 'moneroc',
+      console: true,
+      logPath: '',
+    );
+  }
+
   return status == 0;
 }
 
diff --git a/cw_monero/lib/monero_unspent.dart b/cw_monero/lib/monero_unspent.dart
index 87d8f0b39..f45fcddaf 100644
--- a/cw_monero/lib/monero_unspent.dart
+++ b/cw_monero/lib/monero_unspent.dart
@@ -1,10 +1,32 @@
 import 'package:cw_core/unspent_transaction_output.dart';
+import 'package:cw_monero/api/coins_info.dart';
+import 'package:monero/monero.dart' as monero;
 
 class MoneroUnspent extends Unspent {
   MoneroUnspent(
       String address, String hash, String keyImage, int value, bool isFrozen, this.isUnlocked)
       : super(address, hash, value, 0, keyImage) {
-    this.isFrozen = isFrozen;
+  }
+
+  @override
+  set isFrozen(bool freeze) {
+    print("set isFrozen: $freeze ($keyImage): $freeze");
+    final coinId = getCoinByKeyImage(keyImage!);
+    if (coinId == null) throw Exception("Unable to find a coin for address $address");
+    if (freeze) {
+      freezeCoin(coinId);
+    } else {
+      thawCoin(coinId);
+    }
+  }
+
+  @override
+  bool get isFrozen {
+    print("get isFrozen");
+    final coinId = getCoinByKeyImage(keyImage!);
+    if (coinId == null) throw Exception("Unable to find a coin for address $address");
+    final coin = getCoin(coinId);
+    return monero.CoinsInfo_frozen(coin);
   }
 
   final bool isUnlocked;
diff --git a/cw_monero/lib/monero_wallet.dart b/cw_monero/lib/monero_wallet.dart
index 0ae2202ba..60c536b42 100644
--- a/cw_monero/lib/monero_wallet.dart
+++ b/cw_monero/lib/monero_wallet.dart
@@ -275,9 +275,9 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
             'You do not have enough XMR to send this amount.');
       }
 
-      if (!spendAllCoins && (allInputsAmount < totalAmount + estimatedFee)) {
-        throw MoneroTransactionNoInputsException(inputs.length);
-      }
+      // if (!spendAllCoins && (allInputsAmount < totalAmount + estimatedFee)) {
+      //   throw MoneroTransactionNoInputsException(inputs.length);
+      // }
 
       final moneroOutputs = outputs.map((output) {
         final outputAddress =
@@ -303,23 +303,22 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
       final formattedAmount =
           output.sendAll ? null : output.formattedCryptoAmount;
 
-      if ((formattedAmount != null && unlockedBalance < formattedAmount) ||
-          (formattedAmount == null && unlockedBalance <= 0)) {
-        final formattedBalance = moneroAmountToString(amount: unlockedBalance);
-
-        throw MoneroTransactionCreationException(
-            'You do not have enough unlocked balance. Unlocked: $formattedBalance. Transaction amount: ${output.cryptoAmount}.');
-      }
+      // if ((formattedAmount != null && unlockedBalance < formattedAmount) ||
+      //     (formattedAmount == null && unlockedBalance <= 0)) {
+      //   final formattedBalance = moneroAmountToString(amount: unlockedBalance);
+      //
+      //   throw MoneroTransactionCreationException(
+      //       'You do not have enough unlocked balance. Unlocked: $formattedBalance. Transaction amount: ${output.cryptoAmount}.');
+      // }
 
       final estimatedFee =
           calculateEstimatedFee(_credentials.priority, formattedAmount);
-      if (!spendAllCoins &&
-          ((formattedAmount != null &&
-                  allInputsAmount < (formattedAmount + estimatedFee)) ||
-              formattedAmount == null)) {
-        throw MoneroTransactionNoInputsException(inputs.length);
-      }
-
+      // if (!spendAllCoins &&
+      //     ((formattedAmount != null &&
+      //             allInputsAmount < (formattedAmount + estimatedFee)) ||
+      //         formattedAmount == null)) {
+      //   throw MoneroTransactionNoInputsException(inputs.length);
+      // }
       pendingTransactionDescription =
           await transaction_history.createTransaction(
               address: address!,
@@ -329,6 +328,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
               preferredInputs: inputs);
     }
 
+    // final status = monero.PendingTransaction_status(pendingTransactionDescription);
+
     return PendingMoneroTransaction(pendingTransactionDescription);
   }
 
diff --git a/cw_monero/pubspec.lock b/cw_monero/pubspec.lock
index ee1d48df1..aedff9c80 100644
--- a/cw_monero/pubspec.lock
+++ b/cw_monero/pubspec.lock
@@ -463,8 +463,8 @@ packages:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: "6eb571ea498ed7b854934785f00fabfd0dadf75b"
-      resolved-ref: "6eb571ea498ed7b854934785f00fabfd0dadf75b"
+      ref: "33f6ef2fa28ebcc799529230bbb026a5f9385894"
+      resolved-ref: "33f6ef2fa28ebcc799529230bbb026a5f9385894"
       url: "https://github.com/mrcyjanek/monero_c"
     source: git
     version: "0.0.0"
diff --git a/cw_monero/pubspec.yaml b/cw_monero/pubspec.yaml
index cb1f5519f..ec81f6ee7 100644
--- a/cw_monero/pubspec.yaml
+++ b/cw_monero/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c
-      ref: 6eb571ea498ed7b854934785f00fabfd0dadf75b # monero_c hash
+      ref: 33f6ef2fa28ebcc799529230bbb026a5f9385894 # monero_c hash
       path: impls/monero.dart
   mutex: ^3.1.0
 
diff --git a/cw_wownero/lib/api/transaction_history.dart b/cw_wownero/lib/api/transaction_history.dart
index 6b0923e83..b0a6bc3d0 100644
--- a/cw_wownero/lib/api/transaction_history.dart
+++ b/cw_wownero/lib/api/transaction_history.dart
@@ -12,7 +12,9 @@ import 'package:monero/src/generated_bindings_wownero.g.dart' as wownero_gen;
 
 
 String getTxKey(String txId) {
-  return wownero.Wallet_getTxKey(wptr!, txid: txId);
+  final ret = wownero.Wallet_getTxKey(wptr!, txid: txId);
+  wownero.Wallet_status(wptr!);
+  return ret;
 }
 
 wownero.TransactionHistory? txhistory;
diff --git a/cw_wownero/pubspec.lock b/cw_wownero/pubspec.lock
index c90340800..17582720a 100644
--- a/cw_wownero/pubspec.lock
+++ b/cw_wownero/pubspec.lock
@@ -463,8 +463,8 @@ packages:
     dependency: "direct main"
     description:
       path: "impls/monero.dart"
-      ref: "6eb571ea498ed7b854934785f00fabfd0dadf75b"
-      resolved-ref: "6eb571ea498ed7b854934785f00fabfd0dadf75b"
+      ref: "33f6ef2fa28ebcc799529230bbb026a5f9385894"
+      resolved-ref: "33f6ef2fa28ebcc799529230bbb026a5f9385894"
       url: "https://github.com/mrcyjanek/monero_c"
     source: git
     version: "0.0.0"
diff --git a/cw_wownero/pubspec.yaml b/cw_wownero/pubspec.yaml
index 6943e60c3..41a2d67c9 100644
--- a/cw_wownero/pubspec.yaml
+++ b/cw_wownero/pubspec.yaml
@@ -25,7 +25,7 @@ dependencies:
   monero:
     git:
       url: https://github.com/mrcyjanek/monero_c
-      ref: 6eb571ea498ed7b854934785f00fabfd0dadf75b # monero_c hash
+      ref: 33f6ef2fa28ebcc799529230bbb026a5f9385894 # monero_c hash
       path: impls/monero.dart
   mutex: ^3.1.0
 
diff --git a/scripts/android/pubspec_gen.sh b/scripts/android/pubspec_gen.sh
index 468f548f3..9ff6d4883 100755
--- a/scripts/android/pubspec_gen.sh
+++ b/scripts/android/pubspec_gen.sh
@@ -19,6 +19,7 @@ case $APP_ANDROID_TYPE in
                 CONFIG_ARGS="--haven"
                 ;;
 esac
+CONFIG_ARGS="--monero --ethereum --polygon --nano --solana --tron --wownero"
 
 cd ../..
 cp -rf pubspec_description.yaml pubspec.yaml
diff --git a/scripts/prepare_moneroc.sh b/scripts/prepare_moneroc.sh
index 24f4d201c..4932411ad 100755
--- a/scripts/prepare_moneroc.sh
+++ b/scripts/prepare_moneroc.sh
@@ -8,7 +8,7 @@ if [[ ! -d "monero_c" ]];
 then
     git clone https://github.com/mrcyjanek/monero_c --branch rewrite-wip
     cd monero_c
-    git checkout 6eb571ea498ed7b854934785f00fabfd0dadf75b
+    git checkout 33f6ef2fa28ebcc799529230bbb026a5f9385894
     git reset --hard
     git submodule update --init --force --recursive
     ./apply_patches.sh monero