diff --git a/.gitignore b/.gitignore
index 7bb4989..3e85f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,12 +28,12 @@ migrate_working_dir/
 .dart_tool/
 .packages
 build/
+rust/libepic_cash_wallet.h
+rust/default/
 rust/src/bin
 android/src/main/jniLibs/
-rust/default/
 ios/include/
 ios/libs/
-rust/libepic_cash_wallet.h
 lib/git_versions.dart
 
 scripts/windows/vcpkg/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 41cc7d8..2d1994c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
 ## 0.0.1
 
-* TODO: Describe initial release.
+* Uses Epic Post to cache slates
+
+## 0.0.2
diff --git a/LICENSE b/LICENSE
index ba75c69..9316d42 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1 +1,7 @@
-TODO: Add your license here.
+Copyright 2022-2023 CypherStack LLC, written by tthe Cypher Stack team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index 7cf7e03..e31c77b 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,31 @@
+# flutter_libepiccash
 
-install rust
-https://www.rust-lang.org/tools/install
+An Epic Cash plugin in Dart for Flutter
 
-install cargo ndk
-cargo install cargo-ndk
 
-for android:
+## Build
+Install Rust: https://www.rust-lang.org/tools/install
 
-add targets to rust
+Install cargo ndk: `cargo install cargo-ndk`
+
+### Android
+```
 rustup target add aarch64-linux-android armv7-linux-androideabi i686-linux-android
 
 sudo apt-get install libc6-dev-i386
 
-https://github.com/EpicCash/epic/blob/master/doc/build.md#requirements
+# https://github.com/EpicCash/epic/blob/master/doc/build.md#requirements
 sudo apt install build-essential cmake git libgit2-dev clang libncurses5-dev libncursesw5-dev zlib1g-dev pkg-config llvm
 sudo apt-get install build-essential debhelper cmake libclang-dev libncurses5-dev clang libncursesw5-dev cargo rustc opencl-headers libssl-dev pkg-config ocl-icd-opencl-dev
 
 cd scripts/android
 ./install_ndk.sh
 ./build_all.sh
+```
 
+### iOS:
 
-for ios:
-
-add targets to rust
+```
 rustup target add aarch64-apple-ios x86_64-apple-ios aarch64-apple-ios-sim
 
 cargo install cargo-lipo
@@ -31,3 +33,31 @@ cargo install cbindgen
 
 cd scripts/ios
 ./build_all
+```
+
+### Linux:
+
+```
+cd scripts/linux
+./build_all.sh
+```
+
+### Windows:
+
+Cross compile:
+```
+cd scripts/windows
+./build_all.sh
+```
+
+Native build:
+```
+cd scripts/windows
+./build_all.ps1
+```
+
+## Test
+Run `flutter test`
+
+## Usage
+See [Stack Wallet](https://github.com/cypherstack/stack_wallet) and [Epic Pay](https://github.com/cypherstack/epic-mobile)
diff --git a/android/build.gradle b/android/build.gradle
index 4b834a5..aba9274 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,4 +1,4 @@
-group 'com.example.flutter_libepiccash'
+group 'com.cypherstack.flutter_libepiccash'
 version '1.0-SNAPSHOT'
 
 buildscript {
diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
index b0411d6..fbf8cf8 100644
--- a/android/src/main/AndroidManifest.xml
+++ b/android/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-  package="com.example.flutter_libepiccash">
+  package="com.cypherstack.flutter_libepiccash">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/android/src/main/kotlin/com/example/flutter_libepiccash/FlutterLibepiccashPlugin.kt b/android/src/main/kotlin/com/cypherstack/flutter_libepiccash/FlutterLibepiccashPlugin.kt
similarity index 96%
rename from android/src/main/kotlin/com/example/flutter_libepiccash/FlutterLibepiccashPlugin.kt
rename to android/src/main/kotlin/com/cypherstack/flutter_libepiccash/FlutterLibepiccashPlugin.kt
index 0abb4a0..718737d 100644
--- a/android/src/main/kotlin/com/example/flutter_libepiccash/FlutterLibepiccashPlugin.kt
+++ b/android/src/main/kotlin/com/cypherstack/flutter_libepiccash/FlutterLibepiccashPlugin.kt
@@ -1,4 +1,4 @@
-package com.example.flutter_libepiccash
+package com.cypherstack.flutter_libepiccash
 
 import androidx.annotation.NonNull
 
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index a73777f..267c594 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.flutter_libepiccash_example"
+        applicationId "com.cypherstack.flutter_libepiccash_example"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion 18
diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml
index 28d34fd..68cc4de 100644
--- a/example/android/app/src/debug/AndroidManifest.xml
+++ b/example/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_libepiccash_example">
+    package="com.cypherstack.flutter_libepiccash_example">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index eb862d4..fb7fe6b 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_libepiccash_example">
+    package="com.cypherstack.flutter_libepiccash_example">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/example/android/app/src/main/kotlin/com/example/flutter_libepiccash_example/MainActivity.kt b/example/android/app/src/main/kotlin/com/example/flutter_libepiccash_example/MainActivity.kt
index b698612..2e6ead3 100644
--- a/example/android/app/src/main/kotlin/com/example/flutter_libepiccash_example/MainActivity.kt
+++ b/example/android/app/src/main/kotlin/com/example/flutter_libepiccash_example/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.flutter_libepiccash_example
+package com.cypherstack.flutter_libepiccash_example
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml
index 28d34fd..68cc4de 100644
--- a/example/android/app/src/profile/AndroidManifest.xml
+++ b/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.flutter_libepiccash_example">
+    package="com.cypherstack.flutter_libepiccash_example">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index 039cc47..09beda3 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -369,7 +369,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../../ios/libs/";
 				ONLY_ACTIVE_ARCH = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterLibepiccashExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.flutterLibepiccashExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = "non-global";
@@ -503,7 +503,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../../ios/libs/";
 				ONLY_ACTIVE_ARCH = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterLibepiccashExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.flutterLibepiccashExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = "non-global";
@@ -531,7 +531,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../../ios/libs/";
 				ONLY_ACTIVE_ARCH = NO;
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterLibepiccashExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.flutterLibepiccashExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = "non-global";
diff --git a/example/lib/main.dart b/example/lib/main.dart
index 802b86f..c54c593 100644
--- a/example/lib/main.dart
+++ b/example/lib/main.dart
@@ -68,15 +68,15 @@ class _MyHomePageState extends State<MyHomePage> {
   final greeting = "";
 
   Future<String> createFolder(String folderName) async {
-    Directory appDocDir = (await getApplicationDocumentsDirectory());
-    if (Platform.isIOS) {
+    io.Directory appDocDir = (await getApplicationDocumentsDirectory());
+    if (io.Platform.isIOS) {
       appDocDir = (await getLibraryDirectory());
     }
     String appDocPath = appDocDir.path;
     print(appDocPath);
 
-    Directory _appDocDir = (await getApplicationDocumentsDirectory());
-    if (Platform.isIOS) {
+    io.Directory _appDocDir = (await getApplicationDocumentsDirectory());
+    if (io.Platform.isIOS) {
       _appDocDir = (await getLibraryDirectory());
     }
     final io.Directory _appDocDirFolder =
@@ -100,7 +100,7 @@ class _MyHomePageState extends State<MyHomePage> {
 
     var config = {};
     config["wallet_dir"] =
-        "/data/user/0/com.example.flutter_libepiccash_example/app_flutter/test/";
+        "/data/user/0/com.cypherstack.flutter_libepiccash_example/app_flutter/test/";
     config["check_node_api_http_addr"] = "http://95.216.215.107:3413";
     config["chain"] = "mainnet";
     config["account"] = "default";
diff --git a/example/lib/mnemonic_view.dart b/example/lib/mnemonic_view.dart
index 58cc578..bb09f54 100644
--- a/example/lib/mnemonic_view.dart
+++ b/example/lib/mnemonic_view.dart
@@ -122,7 +122,7 @@ class _EpicMnemonicView extends State<EpicMnemonicView> {
       print("wallet dir ${config["wallet_dir"]}");
     } else {
       config["wallet_dir"] =
-          "/data/user/0/com.example.flutter_libepiccash_example/app_flutter/$name/";
+          "/data/user/0/com.cypherstack.flutter_libepiccash_example/app_flutter/$name/";
     }
     config["check_node_api_http_addr"] = "http://95.216.215.107:3413";
     config["chain"] = "mainnet";
diff --git a/example/lib/recover_view.dart b/example/lib/recover_view.dart
index 338f5a5..d753995 100644
--- a/example/lib/recover_view.dart
+++ b/example/lib/recover_view.dart
@@ -96,7 +96,7 @@ class _EpicRecoverWalletView extends State<EpicRecoverWalletView> {
   String _getWalletConfig(name) {
     var config = {};
     config["wallet_dir"] =
-        "/data/user/0/com.example.flutter_libepiccash_example/app_flutter/$name/";
+        "/data/user/0/com.cypherstack.flutter_libepiccash_example/app_flutter/$name/";
     config["check_node_api_http_addr"] = "http://95.216.215.107:3413";
     config["chain"] = "mainnet";
     config["account"] = "default";
diff --git a/example/linux/CMakeLists.txt b/example/linux/CMakeLists.txt
index 08109bd..5c340c2 100644
--- a/example/linux/CMakeLists.txt
+++ b/example/linux/CMakeLists.txt
@@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
 set(BINARY_NAME "flutter_libepiccash_example")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "com.example.flutter_libepiccash")
+set(APPLICATION_ID "com.cypherstack.flutter_libepiccash")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.
diff --git a/example/macos/Runner/Configs/AppInfo.xcconfig b/example/macos/Runner/Configs/AppInfo.xcconfig
index 5890be0..9bb0192 100644
--- a/example/macos/Runner/Configs/AppInfo.xcconfig
+++ b/example/macos/Runner/Configs/AppInfo.xcconfig
@@ -8,7 +8,7 @@
 PRODUCT_NAME = flutter_libepiccash_example
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterLibepiccashExample
+PRODUCT_BUNDLE_IDENTIFIER = com.cypherstack.flutterLibepiccashExample
 
 // The copyright displayed in application information
-PRODUCT_COPYRIGHT = Copyright © 2022 com.example. All rights reserved.
+PRODUCT_COPYRIGHT = Copyright © 2022-203 CypherStack LLC. All rights reserved.
diff --git a/example/windows/runner/Runner.rc b/example/windows/runner/Runner.rc
index 8408fea..d00bcfc 100644
--- a/example/windows/runner/Runner.rc
+++ b/example/windows/runner/Runner.rc
@@ -89,11 +89,11 @@ BEGIN
     BEGIN
         BLOCK "040904e4"
         BEGIN
-            VALUE "CompanyName", "com.example" "\0"
+            VALUE "CompanyName", "com.cyperstack" "\0"
             VALUE "FileDescription", "flutter_libepiccash_example" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
             VALUE "InternalName", "flutter_libepiccash_example" "\0"
-            VALUE "LegalCopyright", "Copyright (C) 2022 com.example. All rights reserved." "\0"
+            VALUE "LegalCopyright", "Copyright (C) 2022-2023 CypherStack LLC. All rights reserved." "\0"
             VALUE "OriginalFilename", "flutter_libepiccash_example.exe" "\0"
             VALUE "ProductName", "flutter_libepiccash_example" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"
diff --git a/ios/Classes/FlutterLibepiccashPlugin.h b/ios/Classes/FlutterLibepiccashPlugin.h
index 817695b..fdbadae 100644
--- a/ios/Classes/FlutterLibepiccashPlugin.h
+++ b/ios/Classes/FlutterLibepiccashPlugin.h
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 
 
-@interface FlutterLibepiccashPlugin : NSObject<FlutterPlugin>
+@interface FlutterLibepiccashPlugin : NSObject <FlutterPlugin>
 @end
 
 // NOTE: put the lines from the include here whenever new api functions are added.
@@ -18,7 +18,7 @@ const char *wallet_init(const char *config,
 const char *get_mnemonic(void);
 
 const char *rust_open_wallet(const char *config,
-                const char *password);
+                             const char *password);
 
 const char *rust_wallet_balances(const char *wallet,
                                  const char *refresh,
@@ -33,12 +33,6 @@ const char *rust_wallet_scan_outputs(const char *wallet,
                                      const char *start_height,
                                      const char *number_of_blocks);
 
-const char *rust_encrypt_slate(const char *wallet,
-                               const char *to_address,
-                               const char *secret_key_index,
-                               const char *epicbox_config,
-                               const char *slate);
-
 const char *rust_create_tx(const char *wallet,
                            const char *amount,
                            const char *to_address,
@@ -50,13 +44,6 @@ const char *rust_txs_get(const char *wallet, const char *refresh_from_node);
 
 const char *rust_tx_cancel(const char *wallet, const char *tx_id);
 
-const char *rust_decrypt_unprocessed_slates(const char *wallet,
-                                            const char *secret_key_index,
-                                            const char *slates);
-
-const char *rust_process_pending_slates(const char *wallet,
-                                        const char *slates);
-
 const char *rust_get_chain_height(const char *config);
 
 const char *rust_delete_wallet(const char *wallet);
@@ -71,13 +58,6 @@ const char *rust_get_tx_fees(const char *wallet,
                              const char *c_amount,
                              const char *min_confirmations);
 
-const char *rust_post_slate_to_node(const char *wallet,
-                                    const char *tx_slate_id);
-
-const char *subscribe_request(const char *wallet,
-                              const char *secret_key_index,
-                              const char *epicbox_config);
-
 const char *rust_tx_send_http(const char *wallet,
                               const char *selection_strategy_is_use_all,
                               const char *minimum_confirmations,
diff --git a/ios/Classes/FlutterLibepiccashPlugin.m b/ios/Classes/FlutterLibepiccashPlugin.m
index c158e60..c57e68f 100644
--- a/ios/Classes/FlutterLibepiccashPlugin.m
+++ b/ios/Classes/FlutterLibepiccashPlugin.m
@@ -1,4 +1,5 @@
 #import "FlutterLibepiccashPlugin.h"
+
 #if __has_include(<flutter_libepiccash/flutter_libepiccash-Swift.h>)
 #import <flutter_libepiccash/flutter_libepiccash-Swift.h>
 #else
@@ -6,10 +7,11 @@
 // is not copied when this plugin is created as a library.
 // https://forums.swift.org/t/swift-static-libraries-dont-copy-generated-objective-c-header/19816
 #import "flutter_libepiccash-Swift.h"
+
 #endif
 
 @implementation FlutterLibepiccashPlugin
-+ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
-  [SwiftFlutterLibepiccashPlugin registerWithRegistrar:registrar];
++ (void)registerWithRegistrar:(NSObject <FlutterPluginRegistrar> *)registrar {
+    [SwiftFlutterLibepiccashPlugin registerWithRegistrar:registrar];
 }
 @end
diff --git a/ios/Classes/SwiftFlutterLibepiccashPlugin.swift b/ios/Classes/SwiftFlutterLibepiccashPlugin.swift
index e9668bb..13da41e 100644
--- a/ios/Classes/SwiftFlutterLibepiccashPlugin.swift
+++ b/ios/Classes/SwiftFlutterLibepiccashPlugin.swift
@@ -2,67 +2,53 @@ import Flutter
 import UIKit
 
 public class SwiftFlutterLibepiccashPlugin: NSObject, FlutterPlugin {
-  public static func register(with registrar: FlutterPluginRegistrar) {
-    let channel = FlutterMethodChannel(name: "flutter_libepiccash", binaryMessenger: registrar.messenger())
-    let instance = SwiftFlutterLibepiccashPlugin()
-    registrar.addMethodCallDelegate(instance, channel: channel)
-  }
+    public static func register(with registrar: FlutterPluginRegistrar) {
+        let channel = FlutterMethodChannel(name: "flutter_libepiccash", binaryMessenger: registrar.messenger())
+        let instance = SwiftFlutterLibepiccashPlugin()
+        registrar.addMethodCallDelegate(instance, channel: channel)
+    }
 
-  public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
-    result("iOS " + UIDevice.current.systemVersion)
-  }
+    public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
+        result("iOS " + UIDevice.current.systemVersion)
+    }
 
 // TODO whenever epic cash is updated with new functions, they need to be dummy called here.
     public func dummyMethodToEnforceBundling() {
-    wallet_init("const char *config",
-                        "const char *mnemonic",
-                        "const char *password",
-                        "const char *name");
-    get_mnemonic();
-    rust_open_wallet("const char *config",
-                    "const char *password");
-    rust_wallet_balances("const char *wallet", "const char *refresh", "const char *min_confirmations");
-    rust_recover_from_mnemonic("const char *config",
-                                       "const char *password",
-                                       "const char *mnemonic",
-                                       "const char *name");
-
-    rust_wallet_scan_outputs("const char *wallet",
-                                     "const char *start_height", "onst char *number_of_blocks");
-
-    rust_encrypt_slate("const char *wallet",
-                               "const char *to_address",
-                               "const char *secret_key_index",
-                               "const char *epicbox_config",
-                               "const char *slate");
-
-    rust_create_tx("const char *wallet",
-                           "const char *amount",
-                           "const char *to_address",
-                           "const char *secret_key_index", "const char *epicbox_config", "const char *min_confirmations");
-    rust_txs_get("const char *wallet",
-                         "const char *refresh_from_node");
-    rust_tx_cancel("const char *wallet", "const char *tx_id");
-    rust_decrypt_unprocessed_slates("const char *wallet", "const char *secret_key_index", "const char *slates");
-    rust_process_pending_slates("const char *wallet",
-                                        "const char *slates");
-
-    rust_get_chain_height("const char *config");
-    rust_delete_wallet("const char *wallet");
-    rust_get_wallet_address("const char *wallet", "const char *index", "const char *epicbox_config");
-    rust_validate_address("const char *address");
-    rust_get_tx_fees("const char *wallet", "const char *c_amount", "const char *min_confirmations");
-    rust_post_slate_to_node("const char *wallet",
-                                        "const char *tx_slate_id");
-    subscribe_request("const char *wallet",
-                                 " const char *secret_key_index",
-                                  "const char *epicbox_config");
-
-    rust_tx_send_http("const char *wallet", "const char *selection_strategy_is_use_all","const char *minimum_confirmations",
-                                  "const char *message",
-                                  "const char *amount",
-                                  "const char *address")
-      // ...
-      // This code will force the bundler to use these functions, but will never be called
+        wallet_init("const char *config",
+                "const char *mnemonic",
+                "const char *password",
+                "const char *name");
+        get_mnemonic();
+        rust_open_wallet("const char *config",
+                "const char *password");
+        rust_wallet_balances("const char *wallet", "const char *refresh", "const char *min_confirmations");
+        rust_recover_from_mnemonic("const char *config",
+                "const char *password",
+                "const char *mnemonic",
+                "const char *name");
+
+        rust_wallet_scan_outputs("const char *wallet",
+                "const char *start_height", "onst char *number_of_blocks");
+
+        rust_create_tx("const char *wallet",
+                "const char *amount",
+                "const char *to_address",
+                "const char *secret_key_index", "const char *epicbox_config", "const char *min_confirmations");
+        rust_txs_get("const char *wallet",
+                "const char *refresh_from_node");
+        rust_tx_cancel("const char *wallet", "const char *tx_id");
+
+        rust_get_chain_height("const char *config");
+        rust_delete_wallet("const char *wallet");
+        rust_get_wallet_address("const char *wallet", "const char *index", "const char *epicbox_config");
+        rust_validate_address("const char *address");
+        rust_get_tx_fees("const char *wallet", "const char *c_amount", "const char *min_confirmations");
+        
+        rust_tx_send_http("const char *wallet", "const char *selection_strategy_is_use_all", "const char *minimum_confirmations",
+                "const char *message",
+                "const char *amount",
+                "const char *address")
+        // ...
+        // This code will force the bundler to use these functions, but will never be called
     }
 }
diff --git a/ios/flutter_libepiccash.podspec b/ios/flutter_libepiccash.podspec
index 8022001..c60302b 100644
--- a/ios/flutter_libepiccash.podspec
+++ b/ios/flutter_libepiccash.podspec
@@ -4,14 +4,14 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'flutter_libepiccash'
-  s.version          = '0.0.1'
-  s.summary          = 'A new Flutter plugin project.'
+  s.version          = '0.0.2'
+  s.summary          = 'An Epic Cash plugin in Dart for Flutter'
   s.description      = <<-DESC
 A new Flutter plugin project.
                        DESC
-  s.homepage         = 'http://example.com'
+  s.homepage         = 'http://cypherstack.com'
   s.license          = { :file => '../LICENSE' }
-  s.author           = { 'Your Company' => 'email@example.com' }
+  s.author           = { 'Cypher Stack team' => 'heyo@cypherstack.com' }
   s.source           = { :path => '.' }
   s.public_header_files = 'Classes**/*.h'
   s.source_files = 'Classes/**/*'
diff --git a/macos/flutter_libepiccash.podspec b/macos/flutter_libepiccash.podspec
index 40bfb18..95f9ff6 100644
--- a/macos/flutter_libepiccash.podspec
+++ b/macos/flutter_libepiccash.podspec
@@ -4,14 +4,14 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'flutter_libepiccash'
-  s.version          = '0.0.1'
-  s.summary          = 'A new Flutter plugin project.'
+  s.version          = '0.0.2'
+  s.summary          = 'An Epic Cash plugin in Dart for Flutter'
   s.description      = <<-DESC
 A new Flutter plugin project.
                        DESC
-  s.homepage         = 'http://example.com'
+  s.homepage         = 'http://cypherstack.com'
   s.license          = { :file => '../LICENSE' }
-  s.author           = { 'Your Company' => 'email@example.com' }
+  s.author           = { 'Cypher Stack team' => 'heyo@cypherstack.com' }
 
   s.source           = { :path => '.' }
   s.source_files     = 'Classes/**/*'
diff --git a/pubspec.yaml b/pubspec.yaml
index 16b96c7..61aa21a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_libepiccash
-description: A new Flutter plugin project.
-version: 0.0.1
+description: An Epic Cash plugin in Dart for Flutter
+version: 0.0.2
 homepage:
 
 environment:
@@ -37,7 +37,7 @@ flutter:
   plugin:
     platforms:
       android:
-        package: com.example.flutter_libepiccash
+        package: com.cypherstack.flutter_libepiccash
         pluginClass: FlutterLibepiccashPlugin
       ios:
         pluginClass: FlutterLibepiccashPlugin
diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index 208881c..8b75737 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -5,7 +5,6 @@ use std::sync::Arc;
 use std::path::{Path};
 use rand::thread_rng;
 use serde::{Deserialize, Serialize};
-use rustc_serialize::json;
 use uuid::Uuid;
 
 use stack_epic_wallet_api::{self, Foreign, ForeignCheckMiddlewareFn, Owner};
@@ -15,8 +14,7 @@ use stack_epic_wallet_libwallet::api_impl::owner;
 use stack_epic_wallet_impls::{DefaultLCProvider, DefaultWalletImpl, EpicboxListenChannel, HTTPNodeClient};
 
 use ws::{
-    CloseCode, Message, Error as WsError, ErrorKind as WsErrorKind,
-    Result as WSResult, Sender, Handler
+    Sender
 };
 
 use stack_epic_keychain::mnemonic;
@@ -33,14 +31,10 @@ use stack_epic_util::secp::rand::Rng;
 use stack_epic_util::secp::key::{SecretKey, PublicKey};
 use stack_epic_util::secp::{Secp256k1};
 
-use stack_epic_wallet_controller::command;
-
 use stack_test_epicboxlib::types::{EpicboxAddress, EpicboxMessage, TxProofErrorKind};
 use android_logger::FilterBuilder;
-use std::{env, thread};
-use std::time::Duration;
 
-#[derive(Serialize, Deserialize, Clone, RustcEncodable, Debug)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Config {
     pub wallet_dir: String,
     pub check_node_api_http_addr: String,
@@ -77,14 +71,12 @@ macro_rules! ensure_wallet (
     )
 );
 
-
-macro_rules! ensure_handler (
-    ($handler_ptr:expr, $handler:ident) => (
-
-        let $handler = ($handler_ptr as *mut TaskHandle<usize>).as_mut().unwrap();
-    )
-);
-
+//macro_rules! ensure_handler (
+//    ($handler_ptr:expr, $handler:ident) => (
+//
+//        let $handler = ($handler_ptr as *mut TaskHandle<usize>).as_mut().unwrap();
+//    )
+//);
 
 fn init_logger() {
     android_logger::init_once(
@@ -152,40 +144,41 @@ extern crate simplelog;
 use log::Level;
 use android_logger::Config as AndroidConfig;
 use ffi_helpers::{export_task, Task};
-use ffi_helpers::task::{CancellationToken, TaskHandle};
-use serde_json::json;
-use stack_epic_wallet_libwallet::api_impl::owner::get_public_address;
-use stack_test_epicboxlib::utils::crypto::{Hex, sign_challenge};
+use ffi_helpers::task::{CancellationToken};
 
 /*
     Create a new wallet
 */
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn wallet_init(
     config: *const c_char,
     mnemonic: *const c_char,
     password: *const c_char,
     name: *const c_char
 ) -> *const c_char {
-
-    let result = match _wallet_init(config, mnemonic, password, name) {
+    match _wallet_init(config, mnemonic, password, name) {
         Ok(created) => {
             created
         }, Err(e ) => {
             let error_msg = format!("Error {}", &e.to_string());
             let error_msg_ptr = CString::new(error_msg).unwrap();
-            let ptr = error_msg_ptr.as_ptr(); // Get a pointer to the underlaying memory for s
+            let ptr = error_msg_ptr.as_ptr(); // Get a pointer to the underlying memory for s
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn get_mnemonic() -> *const c_char {
-    let result = match _get_mnemonic() {
+    match _get_mnemonic() {
         Ok(phrase) => {
             phrase
         }, Err(e ) => {
@@ -195,8 +188,7 @@ pub unsafe extern "C" fn get_mnemonic() -> *const c_char {
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 
@@ -229,25 +221,25 @@ fn _wallet_init(
 
     let str_password = match password.to_str() {
         Ok(str_pass) => {str_pass}, Err(e) => {return Err(
-            Error::from(ErrorKind::GenericError(format!("{}", e.to_string())))
+            Error::from(ErrorKind::GenericError(e.to_string()))
         )}
     };
 
     let str_config = match config.to_str() {
         Ok(str_conf) => {str_conf}, Err(e) => {return Err(
-            Error::from(ErrorKind::GenericError(format!("{}", e.to_string())))
+            Error::from(ErrorKind::GenericError(format!("{}", e)))
         )}
     };
 
     let phrase = match mnemonic.to_str() {
         Ok(str_phrase) => {str_phrase}, Err(e) => {return Err(
-            Error::from(ErrorKind::GenericError(format!("{}", e.to_string())))
+            Error::from(ErrorKind::GenericError(e.to_string()))
         )}
     };
 
     let str_name = match name.to_str() {
         Ok(str_name) => {str_name}, Err(e) => {return Err(
-            Error::from(ErrorKind::GenericError(format!("{}", e.to_string())))
+            Error::from(ErrorKind::GenericError(e.to_string()))
         )}
     };
 
@@ -265,14 +257,16 @@ fn _wallet_init(
     Ok(p)
 }
 
-
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C"  fn rust_open_wallet(
     config: *const c_char,
     password: *const c_char,
 ) -> *const c_char {
     init_logger();
-    let result = match _open_wallet(
+    match _open_wallet(
         config,
         password
     ) {
@@ -281,12 +275,11 @@ pub unsafe extern "C"  fn rust_open_wallet(
         }, Err(e ) => {
             let error_msg = format!("Error {}", &e.to_string());
             let error_msg_ptr = CString::new(error_msg).unwrap();
-            let ptr = error_msg_ptr.as_ptr(); // Get a pointer to the underlaying memory for s
+            let ptr = error_msg_ptr.as_ptr(); // Get a pointer to the underlying memory for s
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _open_wallet(
@@ -300,7 +293,7 @@ fn _open_wallet(
     let str_password = c_password.to_str().unwrap();
 
     let mut result = String::from("");
-    match open_wallet(&str_config.clone(), str_password) {
+    match open_wallet(str_config.clone(), str_password) {
         Ok(res) => {
             let wlt = res.0;
             let sek_key = res.1;
@@ -326,6 +319,9 @@ fn _open_wallet(
     This contains wallet balances
 */
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C"  fn rust_wallet_balances(
     wallet: *const c_char,
     refresh: *const c_char,
@@ -337,10 +333,7 @@ pub unsafe extern "C"  fn rust_wallet_balances(
     let minimum_confirmations: u64 = minimum_confirmations.to_str().unwrap().to_string().parse().unwrap();
 
     let refresh_from_node: u64 = c_refresh.to_str().unwrap().to_string().parse().unwrap();
-    let refresh = match refresh_from_node {
-        0 => false,
-        _=> true
-    };
+    let refresh = !matches!(refresh_from_node, 0);
 
     let wallet_data = wallet_ptr.to_str().unwrap();
     let tuple_wallet_data: (i64, Option<SecretKey>) = serde_json::from_str(wallet_data).unwrap();
@@ -349,7 +342,7 @@ pub unsafe extern "C"  fn rust_wallet_balances(
 
     ensure_wallet!(wlt, wallet);
 
-    let result = match _wallet_balances(
+    match _wallet_balances(
         wallet,
         sek_key,
         refresh,
@@ -364,8 +357,7 @@ pub unsafe extern "C"  fn rust_wallet_balances(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _wallet_balances(
@@ -376,7 +368,7 @@ fn _wallet_balances(
 ) -> Result<*const c_char, Error> {
     let mut wallet_info = "".to_string();
     match get_wallet_info(
-        &wallet,
+        wallet,
         keychain_mask,
         refresh,
         min_confirmations
@@ -394,17 +386,17 @@ fn _wallet_balances(
     Ok(p)
 }
 
-
-
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C"  fn rust_recover_from_mnemonic(
     config: *const c_char,
     password: *const c_char,
     mnemonic: *const c_char,
     name: *const c_char
 ) -> *const c_char {
-
-    let result = match _recover_from_mnemonic(
+    match _recover_from_mnemonic(
         config,
         password,
         mnemonic,
@@ -419,8 +411,7 @@ pub unsafe extern "C"  fn rust_recover_from_mnemonic(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _recover_from_mnemonic(
@@ -436,13 +427,13 @@ fn _recover_from_mnemonic(
 
     let input_conf = c_conf.to_str().unwrap();
     let str_password = c_password.to_str().unwrap();
-    let wallet_config = match Config::from_str(&input_conf.to_string()) {
+    let wallet_config = match Config::from_str(input_conf) {
         Ok(config) => {
             config
-        }, Err(err) => {
+        }, Err(e) => {
             return Err(Error::from(ErrorKind::GenericError(format!(
                 "Wallet config error : {}",
-                err.to_string()
+                e
             ))))
         }
     };
@@ -465,6 +456,9 @@ fn _recover_from_mnemonic(
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn rust_wallet_scan_outputs(
     wallet: *const c_char,
     start_height: *const c_char,
@@ -483,7 +477,7 @@ pub unsafe extern "C" fn rust_wallet_scan_outputs(
 
     ensure_wallet!(wlt, wallet);
 
-    let result = match _wallet_scan_outputs(
+    match _wallet_scan_outputs(
         wallet,
         sek_key,
         start_height,
@@ -498,8 +492,7 @@ pub unsafe extern "C" fn rust_wallet_scan_outputs(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _wallet_scan_outputs(
@@ -510,7 +503,7 @@ fn _wallet_scan_outputs(
 ) -> Result<*const c_char, Error> {
     let mut scan_result = String::from("");
     match wallet_scan_outputs(
-        &wallet,
+        wallet,
         keychain_mask,
         Some(start_height),
         Some(number_of_blocks)
@@ -530,6 +523,9 @@ fn _wallet_scan_outputs(
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn rust_create_tx(
     wallet: *const c_char,
     amount: *const c_char,
@@ -568,7 +564,7 @@ pub unsafe extern "C" fn rust_create_tx(
 
     ensure_wallet!(wlt, wallet);
 
-    let result = match _create_tx(
+    match _create_tx(
         wallet,
         sek_key,
         amount,
@@ -588,9 +584,7 @@ pub unsafe extern "C" fn rust_create_tx(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
-
+    }
 }
 
 fn _create_tx(
@@ -598,21 +592,21 @@ fn _create_tx(
     keychain_mask: Option<SecretKey>,
     amount: u64,
     address: &str,
-    secret_key_index: u32,
+    _secret_key_index: u32,
     epicbox_config: &str,
     minimum_confirmations: u64,
 ) -> Result<*const c_char, Error> {
     let  mut message = String::from("");
     match tx_create(
-        &wallet,
-        keychain_mask.clone(),
+        wallet,
+        keychain_mask,
         amount,
         minimum_confirmations,
         false,
         epicbox_config,
         address) {
         Ok(slate) => {
-            let empty_json = format!(r#"{{"slate_msg": ""}}"#);
+            let empty_json = r#"{"slate_msg": ""}"#.to_string();
             let create_response = (&slate, &empty_json);
             let str_create_response = serde_json::to_string(&create_response).unwrap();
             message.push_str(&str_create_response);
@@ -632,6 +626,9 @@ fn _create_tx(
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn rust_txs_get(
     wallet: *const c_char,
     refresh_from_node: *const c_char,
@@ -639,10 +636,7 @@ pub unsafe extern "C" fn rust_txs_get(
     let c_wallet = CStr::from_ptr(wallet);
     let c_refresh_from_node = CStr::from_ptr(refresh_from_node);
     let refresh_from_node: u64 = c_refresh_from_node.to_str().unwrap().to_string().parse().unwrap();
-    let refresh = match refresh_from_node {
-        0 => false,
-        _=> true
-    };
+    let refresh = !matches!(refresh_from_node, 0);
 
     let wallet_data = c_wallet.to_str().unwrap();
     let tuple_wallet_data: (i64, Option<SecretKey>) = serde_json::from_str(wallet_data).unwrap();
@@ -651,7 +645,7 @@ pub unsafe extern "C" fn rust_txs_get(
 
     ensure_wallet!(wlt, wallet);
 
-    let result = match _txs_get(
+    match _txs_get(
         wallet,
         sek_key,
         refresh,
@@ -665,8 +659,7 @@ pub unsafe extern "C" fn rust_txs_get(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _txs_get(
@@ -695,6 +688,9 @@ fn _txs_get(
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn rust_tx_cancel(
     wallet: *const c_char,
     tx_id: *const c_char,
@@ -712,7 +708,7 @@ pub unsafe extern "C" fn rust_tx_cancel(
 
     ensure_wallet!(wlt, wallet);
 
-    let result = match _tx_cancel(
+    match _tx_cancel(
         wallet,
         sek_key,
         uuid,
@@ -726,8 +722,7 @@ pub unsafe extern "C" fn rust_tx_cancel(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _tx_cancel(
@@ -750,10 +745,13 @@ fn _tx_cancel(
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn rust_get_chain_height(
     config: *const c_char,
 ) -> *const c_char {
-    let result = match _get_chain_height(
+    match _get_chain_height(
         config
     ) {
         Ok(chain_height) => {
@@ -765,15 +763,14 @@ pub unsafe extern "C" fn rust_get_chain_height(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _get_chain_height(config: *const c_char) -> Result<*const c_char, Error> {
     let c_config = unsafe { CStr::from_ptr(config) };
     let str_config = c_config.to_str().unwrap();
     let mut chain_height = "".to_string();
-    match get_chain_height(&str_config) {
+    match get_chain_height(str_config) {
         Ok(chain_tip) => {
             debug!("CHAIN_HEIGHT {}", chain_tip);
             chain_height.push_str(&chain_tip.to_string());
@@ -790,6 +787,9 @@ fn _get_chain_height(config: *const c_char) -> Result<*const c_char, Error> {
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn rust_delete_wallet(
     wallet: *const c_char,
 ) -> *const c_char  {
@@ -797,9 +797,9 @@ pub unsafe extern "C" fn rust_delete_wallet(
     let wallet_data = wallet_ptr.to_str().unwrap();
     let tuple_wallet_data: (i64, Option<SecretKey>) = serde_json::from_str(wallet_data).unwrap();
     let wlt = tuple_wallet_data.0;
-    let sek_key = tuple_wallet_data.1;
+    let _sek_key = tuple_wallet_data.1;
     ensure_wallet!(wlt, wallet);
-    let result = match _delete_wallet(
+    match _delete_wallet(
         wallet
     ) {
         Ok(deleted) => {
@@ -811,8 +811,7 @@ pub unsafe extern "C" fn rust_delete_wallet(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _delete_wallet(
@@ -836,6 +835,9 @@ fn _delete_wallet(
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn rust_tx_send_http(
     wallet: *const c_char,
     selection_strategy_is_use_all: *const c_char,
@@ -847,10 +849,7 @@ pub unsafe extern "C" fn rust_tx_send_http(
     let c_wallet = CStr::from_ptr(wallet);
     let c_strategy_is_use_all = CStr::from_ptr(selection_strategy_is_use_all);
     let strategy_is_use_all: u64 = c_strategy_is_use_all.to_str().unwrap().to_string().parse().unwrap();
-    let strategy_use_all = match strategy_is_use_all {
-        0 => false,
-        _=> true
-    };
+    let strategy_use_all = !matches!(strategy_is_use_all, 0);
     let c_minimum_confirmations = CStr::from_ptr(minimum_confirmations);
     let minimum_confirmations: u64 = c_minimum_confirmations.to_str().unwrap().to_string().parse().unwrap();
     let c_message = CStr::from_ptr(message);
@@ -866,7 +865,7 @@ pub unsafe extern "C" fn rust_tx_send_http(
     let sek_key = tuple_wallet_data.1;
     ensure_wallet!(wlt, wallet);
 
-    let result = match _tx_send_http(
+    match _tx_send_http(
         wallet,
         sek_key,
         strategy_use_all,
@@ -884,8 +883,7 @@ pub unsafe extern "C" fn rust_tx_send_http(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _tx_send_http(
@@ -908,7 +906,7 @@ fn _tx_send_http(
         address
     ) {
         Ok(sent) => {
-            let empty_json = format!(r#"{{"slate_msg": ""}}"#);
+            let empty_json = r#"{"slate_msg": ""}"#.to_string();
             let create_response = (&sent, &empty_json);
             let str_create_response = serde_json::to_string(&create_response).unwrap();
             send_result.push_str(&str_create_response);
@@ -931,6 +929,9 @@ pub struct EpicboxInfo {
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn rust_get_wallet_address(
     wallet: *const c_char,
     index: *const c_char,
@@ -948,7 +949,7 @@ pub unsafe extern "C" fn rust_get_wallet_address(
     let sek_key = tuple_wallet_data.1;
 
     ensure_wallet!(wlt, wallet);
-    let result = match _get_wallet_address(
+    match _get_wallet_address(
         wallet,
         sek_key,
         index,
@@ -963,8 +964,7 @@ pub unsafe extern "C" fn rust_get_wallet_address(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _get_wallet_address(
@@ -973,7 +973,7 @@ fn _get_wallet_address(
     index: u32,
     epicbox_config: &str
 ) -> Result<*const c_char, Error> {
-    let address = get_wallet_address(&wallet, keychain_mask, index, epicbox_config);
+    let address = get_wallet_address(wallet, keychain_mask, index, epicbox_config);
     let s = CString::new(address).unwrap();
     let p = s.as_ptr(); // Get a pointer to the underlaying memory for s
     std::mem::forget(s); // Give up the responsibility of cleaning up/freeing s
@@ -994,10 +994,13 @@ pub fn get_wallet_address(
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn rust_validate_address(
     address: *const c_char,
 ) -> *const c_char {
-    let address = unsafe { CStr::from_ptr(address) };
+    let address = CStr::from_ptr(address);
     let str_address = address.to_str().unwrap();
     let validate = validate_address(str_address);
     let return_value = match validate {
@@ -1012,6 +1015,9 @@ pub unsafe extern "C" fn rust_validate_address(
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn rust_get_tx_fees(
     wallet: *const c_char,
     c_amount: *const c_char,
@@ -1031,9 +1037,8 @@ pub unsafe extern "C" fn rust_get_tx_fees(
     let sek_key = tuple_wallet_data.1;
 
     ensure_wallet!(wlt, wallet);
-
-    let result = match _get_tx_fees(
-        &wallet,
+    match _get_tx_fees(
+        wallet,
         sek_key,
         amount,
         minimum_confirmations,
@@ -1047,8 +1052,7 @@ pub unsafe extern "C" fn rust_get_tx_fees(
             std::mem::forget(error_msg_ptr);
             ptr
         }
-    };
-    result
+    }
 }
 
 fn _get_tx_fees(
@@ -1073,13 +1077,13 @@ fn _get_tx_fees(
 
 pub fn create_wallet(config: &str, phrase: &str, password: &str, name: &str) -> Result<String, Error> {
     let wallet_pass = ZeroingString::from(password);
-    let wallet_config = match Config::from_str(&config) {
+    let wallet_config = match Config::from_str(config) {
         Ok(config) => {
             config
         }, Err(e) => {
             return  Err(Error::from(ErrorKind::GenericError(format!(
                 "Error getting wallet config: {}",
-                e.to_string()
+                e
             ))));
         }
     };
@@ -1124,7 +1128,7 @@ pub fn get_wallet_secret_key_pair(
 ) -> Result<(SecretKey, PublicKey), Error>{
     let parent_key_id = {
         wallet_lock!(wallet, w);
-        w.parent_key_id().clone()
+        w.parent_key_id()
     };
     wallet_lock!(wallet, w);
 
@@ -1151,10 +1155,10 @@ pub fn get_wallet_secret_key_pair(
         Ok(p_key) => {
             p_key
         }
-        Err(err) => {
+        Err(e) => {
             return Err(Error::from(
                 ErrorKind::GenericError(
-                    format!("{}", err.to_string())
+                    format!("{}", e)
                 )
             ));
         }
@@ -1200,7 +1204,7 @@ pub fn get_wallet_info(
                 amount_locked: nano_to_deci(wallet_summary.amount_locked)
             })
         }, Err(e) => {
-            return  Err(e);
+            Err(e)
         }
     }
 
@@ -1210,7 +1214,7 @@ pub fn get_wallet_info(
     Recover wallet from mnemonic
 */
 pub fn recover_from_mnemonic(mnemonic: &str, password: &str, config: &Config, name: &str) -> Result<(), Error> {
-    let wallet = match get_wallet(&config) {
+    let wallet = match get_wallet(config) {
         Ok(conf) => {
             conf
         }
@@ -1243,7 +1247,7 @@ pub fn recover_from_mnemonic(mnemonic: &str, password: &str, config: &Config, na
             }
         } else {
             match lc.create_wallet(
-                Some(&name),
+                Some(name),
                 Some(ZeroingString::from(mnemonic)),
                 32,
                 ZeroingString::from(password),
@@ -1266,13 +1270,7 @@ pub fn recover_from_mnemonic(mnemonic: &str, password: &str, config: &Config, na
 */
 pub fn mnemonic() -> Result<String, stack_epic_keychain::mnemonic::Error> {
     let seed = create_seed(32);
-    match mnemonic::from_entropy(&seed) {
-        Ok(mnemonic_str) => {
-            Ok(mnemonic_str)
-        }, Err(e) => {
-            return  Err(e);
-        }
-    }
+    mnemonic::from_entropy(&seed)
 }
 
 fn create_seed(seed_length: u64) -> Vec<u8> {
@@ -1301,7 +1299,7 @@ fn get_wallet(config: &Config) -> Result<Wallet, Error> {
         DefaultLCProvider<HTTPNodeClient, ExtKeychain>,
         HTTPNodeClient,
         ExtKeychain,
-    >(wallet_config.clone(), node_client) {
+    >(wallet_config, node_client) {
         Ok(wallet_inst) => {
             wallet_inst
         }
@@ -1309,7 +1307,7 @@ fn get_wallet(config: &Config) -> Result<Wallet, Error> {
             return  Err(e);
         }
     };
-    return Ok(wallet);
+    Ok(wallet)
 }
 /*
     New wallet instance
@@ -1324,7 +1322,7 @@ fn inst_wallet<L, C, K>(
         C: NodeClient + 'static,
         K: Keychain + 'static,
 {
-    let mut wallet = Box::new(DefaultWalletImpl::<'static, C>::new(node_client.clone()).unwrap())
+    let mut wallet = Box::new(DefaultWalletImpl::<'static, C>::new(node_client).unwrap())
         as Box<dyn WalletInst<'static, L, C, K>>;
     let lc = match wallet.lc_provider() {
         Ok(wallet_lc) => {
@@ -1335,9 +1333,7 @@ fn inst_wallet<L, C, K>(
         }
     };
     match lc.set_top_level_directory(&config.data_file_dir) {
-        Ok(_) => {
-            ()
-        }
+        Ok(_) => {}
         Err(err) => {
             return  Err(err);
         }
@@ -1346,17 +1342,17 @@ fn inst_wallet<L, C, K>(
 }
 
 pub fn get_chain_height(config: &str) -> Result<u64, Error> {
-    let config = match Config::from_str(&config.to_string()) {
+    let config = match Config::from_str(config) {
         Ok(config) => {
             config
         }, Err(e) => {
             return Err(Error::from(ErrorKind::GenericError(format!(
-                "{}",
-                "Unable to get wallet config"
+                "Unable to get wallet config: {}",
+                e
             ))))
         }
     };
-    let wallet_config = match create_wallet_config(config.clone()) {
+    let wallet_config = match create_wallet_config(config) {
         Ok(wallet_conf) => {
             wallet_conf
         }
@@ -1394,27 +1390,18 @@ pub fn wallet_scan_outputs(
                 chain_tip.0
             },
             Err(_e) => {
-                0
+                0 // May want to return _e or _e.to_string() here
             }
         }
     };
 
     if tip == 0 {
-        return Err(Error::from(ErrorKind::GenericError(format!(
-            "{}",
-            "Unable to scan, could not determine chain height"
-        ))));
+        return Err(Error::from(ErrorKind::GenericError("Unable to scan, could not determine chain height".to_string())));
     }
 
-    let start_height: u64 = match start_height {
-        Some(h) => h,
-        None => 1,
-    };
+    let start_height: u64 = start_height.unwrap_or(1);
 
-    let number_of_blocks_to_scan: u64 = match number_of_blocks_to_scan {
-        Some(h) => h,
-        None => 0,
-    };
+    let number_of_blocks_to_scan: u64 = number_of_blocks_to_scan.unwrap_or(0);
 
     let last_block = start_height + number_of_blocks_to_scan;
     let end_height: u64 = match last_block.cmp(&tip) {
@@ -1442,7 +1429,7 @@ pub fn wallet_scan_outputs(
 
             let parent_key_id = {
                 wallet_lock!(wallet, w);
-                w.parent_key_id().clone()
+                w.parent_key_id()
             };
 
             {
@@ -1456,17 +1443,13 @@ pub fn wallet_scan_outputs(
                     }
                 };
                 match batch.save_last_confirmed_height(&parent_key_id, info.height) {
-                    Ok(_) => {
-                        ()
-                    }
+                    Ok(_) => {}
                     Err(err) => {
                         return  Err(err);
                     }
                 };
                 match batch.commit() {
-                    Ok(_) => {
-                        ()
-                    }
+                    Ok(_) => {}
                     Err(err) => {
                         return  Err(err);
                     }
@@ -1477,7 +1460,7 @@ pub fn wallet_scan_outputs(
             let result = info.height;
             Ok(serde_json::to_string(&result).unwrap())
         }, Err(e) => {
-            return  Err(e);
+            Err(e)
         }
     }
 }
@@ -1617,7 +1600,7 @@ pub fn tx_create(
             Ok(str_result)
         },
         Err(e)=> {
-            return Err(e);
+            Err(e)
         }
     }
 }
@@ -1631,7 +1614,7 @@ pub fn tx_cancel(wallet: &Wallet, keychain_mask: Option<SecretKey>, tx_slate_id:
         Ok(_) => {
             Ok("cancelled".to_owned())
         },Err(e) => {
-            return Err(e);
+            Err(e)
         }
     }
 }
@@ -1697,7 +1680,7 @@ pub fn tx_receive(wallet: &Wallet, keychain_mask: Option<SecretKey>, account: &s
         keychain_mask.clone(),
         Some(check_middleware));
 
-    match foreign_api.receive_tx(&slate, Some(&account), None) {
+    match foreign_api.receive_tx(&slate, Some(account), None) {
         Ok(slate)=> {
             let txs = match owner_api.retrieve_txs(
                 keychain_mask.as_ref(),
@@ -1719,7 +1702,7 @@ pub fn tx_receive(wallet: &Wallet, keychain_mask: Option<SecretKey>, account: &s
             Ok(serde_json::to_string(&final_result).unwrap())
         },
         Err(e)=> {
-            return  Err(e);
+            Err(e)
         }
     }
 }
@@ -1761,7 +1744,7 @@ pub fn tx_finalize(
             Ok(serde_json::to_string(&final_result).unwrap())
         },
         Err(e)=> {
-            return  Err(e);
+            Err(e)
         }
     }
 }
@@ -1779,7 +1762,7 @@ pub fn tx_post(
         keychain_mask.as_ref(),
         false,
         None,
-        Some(tx_uuid.clone())
+        Some(tx_uuid)
     ) {
         Ok(result) => {
             result
@@ -1806,7 +1789,7 @@ pub fn tx_post(
                     Ok("tx_posted_to_node".to_owned())
                 },
                 Err(err)=> {
-                    return Err(err);
+                    Err(err)
                 }
             }
         }
@@ -1831,8 +1814,8 @@ pub fn get_epicbox_address(
 
 pub fn derive_public_key_from_address(address: &str) -> PublicKey {
     let address = EpicboxAddress::from_str(address).unwrap();
-    let public_key = address.public_key().unwrap();
-    public_key
+    
+    address.public_key().unwrap()
 }
 
 pub fn convert_deci_to_nano(amount: f64) -> u64 {
@@ -1843,8 +1826,8 @@ pub fn convert_deci_to_nano(amount: f64) -> u64 {
 
 pub fn nano_to_deci(amount: u64) -> f64 {
     let base_nano = 100000000;
-    let decimal = amount as f64 / base_nano as f64;
-    decimal
+    
+    amount as f64 / base_nano as f64
 }
 
 /*
@@ -1859,12 +1842,12 @@ pub fn decrypt_message(receiver_key: &SecretKey, msg_json: serde_json::Value) ->
     let encrypted_message: EpicboxMessage =
         serde_json::from_str(message).map_err(|_| TxProofErrorKind::ParseEpicboxMessage).unwrap();
 
-    let key = encrypted_message.key(&sender_public_key, &receiver_key).unwrap();
+    let key = encrypted_message.key(&sender_public_key, receiver_key).unwrap();
     let decrypted_message = match encrypted_message.decrypt_with_key(&key) {
         Ok(decrypted) => {
             decrypted
         }, Err(e) => {
-            format!("Error {}", e.to_string())
+            format!("Error {}", e)
         }
     };
 
@@ -1876,22 +1859,22 @@ pub fn decrypt_message(receiver_key: &SecretKey, msg_json: serde_json::Value) ->
 */
 pub fn process_epic_box_slate(wallet: &Wallet, keychain_mask: Option<SecretKey>, slate_info: &str
 ) -> Result<String, Error> {
-    let msg_tuple: (String, String) =  serde_json::from_str(&slate_info).unwrap();
+    let msg_tuple: (String, String) =  serde_json::from_str(slate_info).unwrap();
     let transaction: Vec<TxLogEntry> = serde_json::from_str(&msg_tuple.0).unwrap();
 
     match transaction[0].tx_type {
         TxLogEntryType::TxSent => {
-            match tx_receive(&wallet, keychain_mask.clone(), "default", &msg_tuple.1) {
+            match tx_receive(wallet, keychain_mask, "default", &msg_tuple.1) {
                 Ok(slate) => {
                     Ok(slate)
                 },
                 Err(e) => {
-                    return Err(e);
+                    Err(e)
                 }
             }
         },
         TxLogEntryType::TxReceived =>  {
-            let finalize = tx_finalize(&wallet, keychain_mask.clone(), &msg_tuple.1);
+            let finalize = tx_finalize(wallet, keychain_mask, &msg_tuple.1);
             match finalize {
                 Ok(str_slate) => {
                     Ok(str_slate)
@@ -1902,14 +1885,10 @@ pub fn process_epic_box_slate(wallet: &Wallet, keychain_mask: Option<SecretKey>,
             }
         },
         TxLogEntryType::ConfirmedCoinbase => {
-            Err(Error::from(ErrorKind::GenericError(format!(
-                "The provided slate has already been confirmed, not processed.",
-            ))))
+            Err(Error::from(ErrorKind::GenericError("The provided slate has already been confirmed, not processed.".to_string())))
         },
         _ => {
-            Err(Error::from(ErrorKind::GenericError(format!(
-                "The provided slate could not be processed, cancelled by user.",
-            ))))
+            Err(Error::from(ErrorKind::GenericError("The provided slate could not be processed, cancelled by user.".to_string())))
         }
     }
 
@@ -1919,13 +1898,13 @@ pub fn process_epic_box_slate(wallet: &Wallet, keychain_mask: Option<SecretKey>,
 
 */
 pub fn open_wallet(config_json: &str, password: &str) -> Result<(Wallet, Option<SecretKey>), Error> {
-    let config = match Config::from_str(&config_json.to_string()) {
+    let config = match Config::from_str(config_json) {
         Ok(config) => {
             config
         }, Err(e) => {
             return Err(Error::from(ErrorKind::GenericError(format!(
-                "{}",
-                "Unable to get wallet config"
+                "Unable to get wallet config: {}",
+                e
             ))))
         }
     };
@@ -1974,9 +1953,7 @@ pub fn open_wallet(config_json: &str, password: &str) -> Result<(Wallet, Option<
                 };
                 if let Some(account) = config.account {
                     match wallet_inst.set_parent_key_id_by_name(&account) {
-                        Ok(_) => {
-                            ()
-                        }
+                        Ok(_) => {}
                         Err(err) => {
                             return  Err(err);
                         }
@@ -2007,32 +1984,25 @@ pub fn close_wallet(wallet: &Wallet) -> Result<String, Error> {
 
 pub fn validate_address(address: &str) -> bool {
     let address = EpicboxAddress::from_str(address);
-    match address {
-        Ok(_) => {
-            true
-        },
-        _ => {
-            false
-        }
-    }
+    matches!(address, Ok(_))
 }
 
 pub fn delete_wallet(wallet: &Wallet) -> Result<String, Error> {
     //First close the wallet
     let mut result = String::from("");
-    if let Ok(closed) = close_wallet(&wallet) {
+    if let Ok(_closed) = close_wallet(wallet) {
         let api = Owner::new(wallet.clone());
         match api.delete_wallet(None) {
             Ok(_) => {
                 result.push_str("deleted");
             }
             Err(err) => {
-                return  Err(err);
+                return Err(err);
             }
         };
     } else {
-        return  return Err(
-            Error::from(ErrorKind::GenericError(format!("{}", "Error closing wallet")))
+        return Err(
+            Error::from(ErrorKind::GenericError("Error closing wallet".to_string()))
         );
     }
     Ok(result)
@@ -2048,7 +2018,7 @@ pub fn tx_send_http(
     address: &str,
 ) -> Result<String, Error>{
     let api = Owner::new(wallet.clone());
-    let initSendArgs = InitTxSendArgs {
+    let init_send_args = InitTxSendArgs {
         method: "http".to_string(),
         dest: address.to_string(),
         finalize: true,
@@ -2064,13 +2034,13 @@ pub fn tx_send_http(
         num_change_outputs: 1,
         selection_strategy_is_use_all,
         message: Some(message.to_string()),
-        send_args: Some(initSendArgs),
+        send_args: Some(init_send_args),
         ..Default::default()
     };
 
     match api.init_send_tx(keychain_mask.as_ref(), args) {
         Ok(slate) => {
-            println!("{}", "CREATE_TX_SUCCESS");
+            println!("CREATE_TX_SUCCESS");
             //Get transaction for slate, for UI display
             let txs = match api.retrieve_txs(
                 keychain_mask.as_ref(),
@@ -2092,8 +2062,8 @@ pub fn tx_send_http(
             let str_tx_data = serde_json::to_string(&tx_data).unwrap();
             Ok(str_tx_data)
         } Err(err) => {
-            println!("CREATE_TX_ERROR_IN_HTTP_SEND {}", err.to_string());
-            return  Err(err);
+            println!("CREATE_TX_ERROR_IN_HTTP_SEND {}", err);
+            Err(err)
         }
     }
 }
@@ -2112,7 +2082,7 @@ impl Task for Listener {
         let mut spins = 0;
 
         unsafe {
-            let epicbox_conf = serde_json::from_str::<EpicboxConfig>(&self.epicbox_config.as_str()).unwrap();
+            let epicbox_conf = serde_json::from_str::<EpicboxConfig>(self.epicbox_config.as_str()).unwrap();
             let wallet_data = &self.wallet_data;
             let wlt = wallet_data.clone().0;
             let sek_key = wallet_data.clone().1;
@@ -2143,6 +2113,9 @@ export_task! {
 }
 
 #[no_mangle]
+/// # Safety
+///
+/// TODO describe safety constraints
 pub unsafe extern "C" fn run_listener(
     wallet: *const c_char,
     epicbox_config: *const c_char,
@@ -2158,10 +2131,10 @@ pub unsafe extern "C" fn run_listener(
         epicbox_config: epicbox_config.parse().unwrap()
     };
 
-    let handle = listener_spawn(&listen);
+    let _handle = listener_spawn(&listen);
     let msg = format!("START LISTENER {}", "LISTENER STARTED");
     let msg_ptr = CString::new(msg).unwrap();
-    let ptr = msg_ptr.as_ptr(); // Get a pointer to the underlaying memory for s
+    let ptr = msg_ptr.as_ptr(); // Get a pointer to the underlying memory for s
     std::mem::forget(msg_ptr);
     ptr
 }
\ No newline at end of file