diff --git a/.gitmodules b/.gitmodules
index b308f37..cbd3973 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,33 +1,33 @@
 [submodule "deps/bc-crypto-base"]
 	path = deps/bc-crypto-base
-	url = git@github.com:BlockchainCommons/bc-crypto-base.git
+	url = https://github.com/BlockchainCommons/bc-crypto-base.git
 [submodule "deps/bc-shamir"]
 	path = deps/bc-shamir
-	url = git@github.com:BlockchainCommons/bc-shamir.git
+	url = https://github.com/BlockchainCommons/bc-shamir.git
 [submodule "deps/TRNG-for-ATSAMD51J19A-Adafruit-Metro-M4-"]
 	path = deps/TRNG-for-ATSAMD51J19A-Adafruit-Metro-M4-
-	url = git@github.com:SapientHetero/TRNG-for-ATSAMD51J19A-Adafruit-Metro-M4-.git
+	url = https://github.com/SapientHetero/TRNG-for-ATSAMD51J19A-Adafruit-Metro-M4-.git
 [submodule "deps/bc-bip39"]
 	path = deps/bc-bip39
-	url = git@github.com:BlockchainCommons/bc-bip39.git
+	url = https://github.com/BlockchainCommons/bc-bip39.git
 [submodule "deps/GxEPD2"]
 	path = deps/GxEPD2
-	url = git@github.com:BlockchainCommons/GxEPD2.git
+	url = https://github.com/BlockchainCommons/GxEPD2.git
 [submodule "deps/libwally-core"]
 	path = deps/libwally-core
-	url = git@github.com:ElementsProject/libwally-core.git
+	url = https://github.com/ElementsProject/libwally-core.git
 [submodule "deps/secp256k1-embedded"]
 	path = deps/secp256k1-embedded
-	url = git@github.com:BlockchainCommons/secp256k1-embedded.git
+	url = https://github.com/BlockchainCommons/secp256k1-embedded.git
 [submodule "deps/bc-bytewords"]
 	path = deps/bc-bytewords
-	url = git@github.com:BlockchainCommons/bc-bytewords.git
+	url = https://github.com/BlockchainCommons/bc-bytewords.git
 [submodule "deps/bc-sskr"]
 	path = deps/bc-sskr
-	url = git@github.com:BlockchainCommons/bc-sskr.git
+	url = https://github.com/BlockchainCommons/bc-sskr.git
 [submodule "deps/Library-Arduino-Cbor"]
 	path = deps/Library-Arduino-Cbor
-	url = git@github.com:jjtara/Library-Arduino-Cbor.git
+	url = https://github.com/jjtara/Library-Arduino-Cbor.git
 [submodule "deps/ArduinoSTL"]
 	path = deps/ArduinoSTL
-	url = git@github.com:mike-matera/ArduinoSTL.git
+	url = https://github.com/mike-matera/ArduinoSTL.git
diff --git a/doc/installation.md b/doc/installation.md
index 9559900..3a0a821 100644
--- a/doc/installation.md
+++ b/doc/installation.md
@@ -47,7 +47,7 @@ The installation script creates symbolic links in
 `Arduino/Libraries` which point back to the appropriate
 dependencies in `$LK_ROOT/deps`.
 
-### Notes
+#### Notes
 
 It's safe to re-run the installation at any time.
 
@@ -59,6 +59,10 @@ $ cd bc-lethekit
 $ export LK_ROOT=`pwd` && $LK_ROOT/scripts/install-lethekit $LK_ROOT
 ```
 
+### Next steps
+
+Proceed to [Seedtool Installation Instructions](../seedtool/doc/build.md) to compile and install the `seedtool` firmware on your LetheKit.
+
 <!-- TODO
 If you want to uninstall LetheKit use the installation script with
 the `--uninstall` option:
diff --git a/scripts/install-lethekit b/scripts/install-lethekit
index 8746622..cb1b19a 100755
--- a/scripts/install-lethekit
+++ b/scripts/install-lethekit
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Terminal colors
+RED=`tput setaf 1`
+RESET=`tput sgr0`
+
 git submodule update --init --recursive
 
 # usage: install-lethkit <lethkit-root> <arduino-sketchbook>
@@ -24,7 +28,7 @@ while (( "$#" )); do
       break
       ;;
     -*|--*=) # unsupported flags
-      echo "Error: Unsupported flag $1" >&2
+      echo "${RED}==Error: Unsupported flag $1 ==${RESET}" >&2
       exit 1
       ;;
     *) # preserve positional arguments
@@ -36,7 +40,7 @@ done
 
 if [ ${#args[@]} -ne 1 ]
 then
-    usage_error "must be 1 argument"
+    usage_error "${RED}== Error: must be 1 argument==${RESET}"
 fi
 
 echo "Note: Arduino sketchbook location is set in Arduino IDE: click File->Preferences"
@@ -72,7 +76,7 @@ libpath="${aroot}/libraries"
 # We need python to create libwally for arduino
 if ! python3 --version -v COMMAND &> /dev/null
 then
-    echo "Please, install python3."
+    echo "${RED}== Error: Please, install python3.==${RESET}"
     exit
 fi
 
@@ -91,8 +95,7 @@ popd
 # First, check if GxEPD2 is already installed (as a directory), warn
 # and stop in this case.
 gxepd2_path="${aroot}/libraries/GxEPD2"
-[ -d ${gxepd2_path} ] && ! [ -L ${gxepd2_path} ] && echo "GxEPD2 already installed in ${libpath}. Please remove it; we need to replace with SW SPI enabled version." && exit 1
-
+[ -d ${gxepd2_path} ] && ! [ -L ${gxepd2_path} ] && echo "${RED}== ERROR: GxEPD2 already installed in ${libpath}. Please remove it and re-run the last command==${RESET}" && exit 1
 declare -a libs=(
     ArduinoSTL
     bc-ur-arduino
diff --git a/seedtool/README.md b/seedtool/README.md
index 4e502cb..47750a7 100644
--- a/seedtool/README.md
+++ b/seedtool/README.md
@@ -6,25 +6,32 @@ HD wallet master seeds using
 [BIP-39](https://github.com/bitcoin/bips/blob/master/bip-0039.mediawiki)
 and
 [SSKR](https://github.com/BlockchainCommons/Research/blob/master/papers/bcr-2020-011-sskr.md)
-formats. In addition, it supports viewing XPUB keys and addresses in different formats.
+formats. In addition, it supports viewing extended keys and addresses in different formats.
 
-## Compile and Upload Instruction
 
-Please see the [Seedtool Installation Instructions](doc/build.md).
+This guide assumes you have successfully completed with [Seedtool Installation Instructions](doc/build.md).
 
 ## "No Seed" Functions
 
-There are three ways to insert a key into the *seedtool*:
+There are 4 ways to insert a seed into the *seedtool*:  
+A - Generate seed with Dice  
+B - Restore seed from BIP39  
+C - Restore seed from SSKR  
+D - Complete a randomly constructed BIP39 sentence
 
 ![No Seed Menu](doc/images/no-seed.png)
 
-### Key Generation with Dice
+### Seed Generation with Dice
 
 By rolling dice and typing the values, you can gather enough auditable entropy to generate a secure master seed. Rolling 50 dice gathers
 roughly 128 bits of entropy.
 
 ![Generate Seed](doc/images/generate-seed.png)
 
+If you press C, 128 bits of TRNG entropy will be mixed in:
+
+![Generate Seed](doc/images/generate-seed-trng.png)
+
 ### BIP-39 Key Recovery
 
 You can insert a key into the *seedtool* by entering its BIP-39
@@ -41,10 +48,14 @@ mnemonic passphrase which will allow you to use it with most wallets.
 
 ![SSKR Recovery Menu](doc/images/sskr-restore-menu.png) ![SSKR Share Entry](doc/images/sskr-share-restore.png)
 
+### Completing a randomly constructed BIP39 sentence
+
+This is a way to generate your own seed without relying on hardware or software. See [instructions](doc/bip39_sentence_completion.md)
+
 ## Functions with a Seed
 
 Once you have a seed through any of the prior flows, you can create
-BIP-39 and SSKR mnemonic passphrases. In addition you can view extended public
+BIP-39 and SSKR mnemonic passphrases. In addition, you can view extended public and private
 keys, wallet addresses etc. 
 
 ![Seed Present Menu](doc/images/seed-present.png)
@@ -67,10 +78,10 @@ You can choose among different formats:
 ![SSKR Share Format](doc/images/sskr-share-format.png)
 ![SSKR Share View UR](doc/images/sskr-share-view-ur.png) ![SSKR Share View QRUR](doc/images/sskr-share-view-qrur.png)
 
-### Displaying XPUBs
+### Displaying Keys
 
-Extended public keys (XPUBs) can be shown in different formats (base58, UR, QR) with different
-options (slip132, with derivation path). Derivation path can be manually set.
+Extended public and private keys (XPUBs and XPRIVs) can be shown in different formats (base58, UR, QR) with different
+options: slip132, with derivation path and privkey. If privkey is selected, an extended private key (XPRIV) is shown. Derivation path can be manually set or chosen among standard ones: *native segwit*, *nested segwit* and *cosigner*. Cosigner is the one that can be used in multisignature setups.
 
 ![XPUB BASE58](doc/images/xpub_base58.png)
 ![XPUB OPTIONS](doc/images/xpub_options.png)
@@ -99,6 +110,13 @@ A wallet can be exported in the 4 different formats (text, QR, UR and QR-UR):
 ![wallet export](doc/images/wallet_export.png) ![wallet export text](doc/images/wallet_export_text.png)
 ![wallet export text](doc/images/wallet_export_qr.png) ![wallet export text](doc/images/wallet_export_qrur.png)
 
+### Setting network
+
+By pressing 1 in `Seed Present` menu, you can choose among `mainnet`, `testnet` and `regtest`:
+
+![wallet export text](doc/images/network.png)
+
+
 ## Common Workflows
 
 There are several common key management workflows that *seedtool* is
diff --git a/seedtool/doc/bip39_sentence_completion.md b/seedtool/doc/bip39_sentence_completion.md
new file mode 100644
index 0000000..9360139
--- /dev/null
+++ b/seedtool/doc/bip39_sentence_completion.md
@@ -0,0 +1,51 @@
+## BIP39 Sentence Completion
+
+Option `D` (`Complete BIP39`) allows you to
+complete a randomly constructed BIP39 sentence. This means that your seed, keys and wallet creation does not rely on hardware nor software but entirely on a randomized procedure conducted by yourself tossing coins. It is true however that the LetheKit completes the last word, i.e. `checksum word`, so that mnemonic sentence can be correctly parsed.
+
+![](images/no-seed.png)
+
+
+### Procedure
+
+First print out the following table and prepare a coin.
+
+![](images/bip39_complete_table.png)
+
+To randomly choose a BIP39 word you have to toss a coin 11 times and fill out a row in the table. For heads you can write 1 and for tails 0.
+
+For example if your first eleven throws are:
+
+`heads` `tails` `tails` `heads` `tails` `heads` `heads` `tails` `tails` `tails` `heads`
+
+then your first row should look like this:
+
+![](images/bip39_complete_tosses.png)
+
+Coin tosses in every row represent a binary number which can be converted to a BIP39 word with the help of a [lookup table](https://www.rudefox.io/custody/walkthrough/create-seed/lookup-tables.pdf)
+
+![](images/bip39_complete_row.png)
+
+You have to repeat the procedure 12 times to fill out the table and obtain a full mnemonic sentence of 12 words. Then input all the words into LetheKit
+
+![](images/bip39_complete_orig.png)
+
+When `done` LetheKit will ask you if your procedure was truly randomized.
+
+⚠️ : If the procedure is not randomized, i.e. the words are not obtained by flipping a coin, the mnemonic sentence is insecure and leads to a loss of funds.
+
+![](images/bip39_complete_warning.png)
+
+After confirmation, LetheKit will show you the completed BIP39 sentence, i.e. the last word (i.e. `checksum word`) will be transformed to make the sentence complete, while the first eleven words will stay the same.
+
+![](images/bip39_complete_fixed.png)
+
+At this point you have to update the last word on your sheet:
+
+![](images/bip39_complete_last_completed.png)
+
+When done, LetheKit will ask you whether you have updated the last word on your sheet?
+
+![](images/bip39_complete_warning2.png)
+
+By confirming with `yes`, LetheKit will generate a seed, keys and a wallet.
diff --git a/seedtool/doc/build.md b/seedtool/doc/build.md
index 23b25c7..b315bd2 100644
--- a/seedtool/doc/build.md
+++ b/seedtool/doc/build.md
@@ -28,14 +28,15 @@ application will be built and uploaded to your device.
 
 ![](images/arduino-upload.png)
 
-You should see LetheKit refreshing its screen and starting selftest.
+You should see LetheKit refreshing its screen and starting selftest. Selftest can be skipped by holding any key.
+on the keypad.
 
 *Note:* once you enter the bootloader mode it may take some moments for your system
 to recognize your device and port again. Uploading immediately may result in error.
 
-### Use *seedtool*
+### Next steps
 
-See the [Seedtool Application Instructions](../README.md) for information on using the *seedtool*.
+Proceed to [Seedtool Application Instructions](../README.md) for information on using the *seedtool*.
 
 ### Entering Bootloader
 
diff --git a/seedtool/doc/images/bip39_complete_fixed.png b/seedtool/doc/images/bip39_complete_fixed.png
new file mode 100644
index 0000000..294c3b3
Binary files /dev/null and b/seedtool/doc/images/bip39_complete_fixed.png differ
diff --git a/seedtool/doc/images/bip39_complete_last.png b/seedtool/doc/images/bip39_complete_last.png
new file mode 100644
index 0000000..08d8ea2
Binary files /dev/null and b/seedtool/doc/images/bip39_complete_last.png differ
diff --git a/seedtool/doc/images/bip39_complete_last_completed.png b/seedtool/doc/images/bip39_complete_last_completed.png
new file mode 100644
index 0000000..52fc7bf
Binary files /dev/null and b/seedtool/doc/images/bip39_complete_last_completed.png differ
diff --git a/seedtool/doc/images/bip39_complete_orig.png b/seedtool/doc/images/bip39_complete_orig.png
new file mode 100644
index 0000000..a2ff6d5
Binary files /dev/null and b/seedtool/doc/images/bip39_complete_orig.png differ
diff --git a/seedtool/doc/images/bip39_complete_row.png b/seedtool/doc/images/bip39_complete_row.png
new file mode 100644
index 0000000..b2553c2
Binary files /dev/null and b/seedtool/doc/images/bip39_complete_row.png differ
diff --git a/seedtool/doc/images/bip39_complete_table.png b/seedtool/doc/images/bip39_complete_table.png
new file mode 100644
index 0000000..2951e2b
Binary files /dev/null and b/seedtool/doc/images/bip39_complete_table.png differ
diff --git a/seedtool/doc/images/bip39_complete_tosses.png b/seedtool/doc/images/bip39_complete_tosses.png
new file mode 100644
index 0000000..a6fc699
Binary files /dev/null and b/seedtool/doc/images/bip39_complete_tosses.png differ
diff --git a/seedtool/doc/images/bip39_complete_warning.png b/seedtool/doc/images/bip39_complete_warning.png
new file mode 100644
index 0000000..c16428c
Binary files /dev/null and b/seedtool/doc/images/bip39_complete_warning.png differ
diff --git a/seedtool/doc/images/bip39_complete_warning2.png b/seedtool/doc/images/bip39_complete_warning2.png
new file mode 100644
index 0000000..7c9d576
Binary files /dev/null and b/seedtool/doc/images/bip39_complete_warning2.png differ
diff --git a/seedtool/doc/images/complete_bip39.png b/seedtool/doc/images/complete_bip39.png
new file mode 100644
index 0000000..bfa02c6
Binary files /dev/null and b/seedtool/doc/images/complete_bip39.png differ
diff --git a/seedtool/doc/images/generate-seed-trng.png b/seedtool/doc/images/generate-seed-trng.png
new file mode 100644
index 0000000..17fd6a8
Binary files /dev/null and b/seedtool/doc/images/generate-seed-trng.png differ
diff --git a/seedtool/doc/images/generate-seed.png b/seedtool/doc/images/generate-seed.png
index 9c779d4..4ea6b6e 100644
Binary files a/seedtool/doc/images/generate-seed.png and b/seedtool/doc/images/generate-seed.png differ
diff --git a/seedtool/doc/images/network.png b/seedtool/doc/images/network.png
new file mode 100644
index 0000000..cd0be39
Binary files /dev/null and b/seedtool/doc/images/network.png differ
diff --git a/seedtool/doc/images/no-seed.png b/seedtool/doc/images/no-seed.png
index 9c42628..a5ac192 100644
Binary files a/seedtool/doc/images/no-seed.png and b/seedtool/doc/images/no-seed.png differ
diff --git a/seedtool/doc/images/seed-present.png b/seedtool/doc/images/seed-present.png
index c23a6f9..1a5a877 100644
Binary files a/seedtool/doc/images/seed-present.png and b/seedtool/doc/images/seed-present.png differ
diff --git a/seedtool/doc/images/xpub_derivation.png b/seedtool/doc/images/xpub_derivation.png
index 03ab42b..610956d 100644
Binary files a/seedtool/doc/images/xpub_derivation.png and b/seedtool/doc/images/xpub_derivation.png differ
diff --git a/seedtool/doc/images/xpub_options.png b/seedtool/doc/images/xpub_options.png
index 95d4c49..f6eea95 100644
Binary files a/seedtool/doc/images/xpub_options.png and b/seedtool/doc/images/xpub_options.png differ
diff --git a/seedtool/keystore.h b/seedtool/keystore.h
index 72f79cf..0c28479 100644
--- a/seedtool/keystore.h
+++ b/seedtool/keystore.h
@@ -11,7 +11,8 @@
 
 enum stdDerivation {
   SINGLE_NATIVE_SEGWIT,
-  SINGLE_NESTED_SEGWIT
+  SINGLE_NESTED_SEGWIT,
+  MULTISIG_NATIVE_SEGWIT
 };
 
 
@@ -37,11 +38,16 @@ class Keystore
     String get_derivation_path(void);
 
     /**
-     * @brief  get xpub key based on the last derivation_path set by user
+     * @brief  get xpriv key based on the last derivation_path set by user
      *         or default one if none set
      * @pre    update_root_key()
      */
-    bool get_xpub(ext_key *key_out);
+    bool get_xpriv(ext_key *key_out);
+
+    /**
+     * @brief  convert hdkey to base58
+     */
+    bool xpriv_to_base58(ext_key *key, char **output, bool slip132);
 
     /**
      * @brief  convert hdkey to base58
@@ -66,9 +72,9 @@ class Keystore
     bool save_standard_derivation_path(stdDerivation *path, NetwtorkType network);
 
     /**
-     *  @brief is the last saved derivation path a standard one
+     *  @brief is the last saved derivation path a standard one and which one
      */
-    bool is_standard_derivation_path(void);
+    bool is_standard_derivation_path(const stdDerivation *p = NULL);
 
     /**
      * @brief check if bip32 index is hardened
diff --git a/seedtool/keystore.ino b/seedtool/keystore.ino
index 3967f36..cc327c5 100644
--- a/seedtool/keystore.ino
+++ b/seedtool/keystore.ino
@@ -148,6 +148,9 @@ bool Keystore::save_standard_derivation_path(stdDerivation *path, NetwtorkType n
         }
         else if (*path == SINGLE_NESTED_SEGWIT)
             p = F("m/49h/1h/0h");
+
+        else if (*path == MULTISIG_NATIVE_SEGWIT)
+            p = F("m/48h/0h/0h/2h");
       }
       else {
         if (standard_derivation_path == false)
@@ -167,11 +170,13 @@ bool Keystore::save_standard_derivation_path(stdDerivation *path, NetwtorkType n
       return ret;
 }
 
-bool Keystore::is_standard_derivation_path(void) {
+bool Keystore::is_standard_derivation_path(const stdDerivation *p) {
+    if (p != NULL)
+        p = &std_derivation_path;
     return standard_derivation_path;
 }
 
-bool Keystore::get_xpub(ext_key *key_out) {
+bool Keystore::get_xpriv(ext_key *key_out) {
 
     res = bip32_key_from_parent_path(&root, derivation, derivationLen, BIP32_FLAG_KEY_PRIVATE, key_out);
     if (res != WALLY_OK) {
@@ -199,6 +204,9 @@ bool Keystore::xpub_to_base58(ext_key *key, char **output, bool slip132) {
             else if (std_derivation_path == SINGLE_NESTED_SEGWIT) {
                 *bytes_ptr = __builtin_bswap32(0x049d7cb2);
             }
+            else if (std_derivation_path == MULTISIG_NATIVE_SEGWIT) {
+                *bytes_ptr = __builtin_bswap32(0x02aa7ed3);
+            }
             break;
         case TESTNET:
         case REGTEST:
@@ -208,6 +216,60 @@ bool Keystore::xpub_to_base58(ext_key *key, char **output, bool slip132) {
             else if (std_derivation_path == SINGLE_NESTED_SEGWIT) {
                 *bytes_ptr = __builtin_bswap32(0x044a5262);
             }
+            else if (std_derivation_path == MULTISIG_NATIVE_SEGWIT) {
+                *bytes_ptr = __builtin_bswap32(0x02575483);
+            }
+            break;
+        default:
+            break;
+      }
+    }
+
+    ret = wally_base58_from_bytes(bytes, BIP32_SERIALIZED_LEN, BASE58_FLAG_CHECKSUM, output);
+
+    // clear
+    memset(bytes, 0, sizeof(bytes));
+
+    if (ret == WALLY_OK)
+        return true;
+    else
+        return false;
+}
+
+bool Keystore::xpriv_to_base58(ext_key *key, char **output, bool slip132) {
+
+    int ret;
+    unsigned char bytes[BIP32_SERIALIZED_LEN];
+    uint32_t *bytes_ptr = (uint32_t *)bytes;
+
+    if ((ret = bip32_key_serialize(key, BIP32_FLAG_KEY_PRIVATE, bytes, sizeof(bytes))))
+        return false;
+
+
+    if (slip132 && standard_derivation_path) {
+      switch(network.get_network()) {
+        case MAINNET:
+            if (std_derivation_path == SINGLE_NATIVE_SEGWIT) {
+                *bytes_ptr = __builtin_bswap32(0x04b2430c);
+            }
+            else if (std_derivation_path == SINGLE_NESTED_SEGWIT) {
+                *bytes_ptr = __builtin_bswap32(0x049d7878);
+            }
+            else if (std_derivation_path == MULTISIG_NATIVE_SEGWIT) {
+                *bytes_ptr = __builtin_bswap32(0x02aa7a99);
+            }
+            break;
+        case TESTNET:
+        case REGTEST:
+            if (std_derivation_path == SINGLE_NATIVE_SEGWIT) {
+                *bytes_ptr = __builtin_bswap32(0x045f18bc);
+            }
+            else if (std_derivation_path == SINGLE_NESTED_SEGWIT) {
+                *bytes_ptr = __builtin_bswap32(0x044a4e28);
+            }
+            else if (std_derivation_path == MULTISIG_NATIVE_SEGWIT) {
+                *bytes_ptr = __builtin_bswap32(0x02575048);
+            }
             break;
         default:
             break;
diff --git a/seedtool/network.h b/seedtool/network.h
index 07b9b2b..ba25b81 100644
--- a/seedtool/network.h
+++ b/seedtool/network.h
@@ -10,7 +10,7 @@ enum NetwtorkType {
 class Network
 {
     public:
-    Network(NetwtorkType network=REGTEST);
+    Network(NetwtorkType network=MAINNET);
     String as_string();
     void set_network(NetwtorkType type);
     NetwtorkType get_network();
diff --git a/seedtool/seed.h b/seedtool/seed.h
index 537e043..8d3a442 100644
--- a/seedtool/seed.h
+++ b/seedtool/seed.h
@@ -61,6 +61,10 @@ class BIP39Seq {
     // Returns NULL if restore fails (bad BIP39 checksum).
     Seed * restore_seed() const;
 
+    // fix_bip39_checksum is only intended for when user wants
+    // to generate seed from bip39 words
+    void fix_bip39_checksum(void) { bip39_append_checksum(ctx); }
+
     // we need to have full menmonic words saved as string
     // which is needed to calculate mnemonic seed
     String get_mnemonic_as_string();
diff --git a/seedtool/seed.ino b/seedtool/seed.ino
index 4382c33..115fbd9 100644
--- a/seedtool/seed.ino
+++ b/seedtool/seed.ino
@@ -159,8 +159,6 @@ uint8_t const * SSKRShareSeq::get_share(size_t ndx) const {
 }
 
 void SSKRShareSeq::set_share(size_t ndx, uint8_t const * share, size_t len) {
-    Serial.println("** **");
-    Serial.println(ndx); Serial.println(nshares);
     serial_assert(ndx < nshares);
     if (shares[ndx])
         free(shares[ndx]);
@@ -177,10 +175,6 @@ String SSKRShareSeq::get_share_strings(size_t ndx) const {
 Seed * SSKRShareSeq::restore_seed() const {
     uint8_t seed_data[Seed::SIZE];
 
-    Serial.println("restore seed");
-    Serial.println(bytes_in_each_share);
-    Serial.println(nshares);
-
     last_rv = sskr_combine(const_cast<const uint8_t **>(shares),
                              bytes_in_each_share,
                              nshares,
@@ -193,13 +187,13 @@ Seed * SSKRShareSeq::restore_seed() const {
 class CborListen : public CborListener {
   public:
     void OnInteger(int32_t value){ };
-    void OnBytes(unsigned char *data, unsigned int size) {Serial.println("bytes"); memcpy(bytes, data, size); len = size;};
+    void OnBytes(unsigned char *data, unsigned int size) { memcpy(bytes, data, size); len = size; };
     void OnString(String &str) {};
     void OnArray(unsigned int size) {};
     void OnMap(unsigned int size) {};
     void OnTag(uint32_t tag) { tag_ = tag; };
-    void OnSpecial(uint32_t code) {Serial.println("tag");};
-    void OnError(const char *error) {Serial.println("error");};
+    void OnSpecial(uint32_t code) {};
+    void OnError(const char *error) {};
 
     // we are gonna collect the tag and bytes
     uint32_t tag_;
diff --git a/seedtool/selftest.ino b/seedtool/selftest.ino
index f69e351..e41bba7 100644
--- a/seedtool/selftest.ino
+++ b/seedtool/selftest.ino
@@ -302,7 +302,7 @@ bool test_bip32(void) {
         return false;
     }
 
-    keystore.get_xpub(&key);
+    keystore.get_xpriv(&key);
     bip32_key_to_base58(&key, BIP32_FLAG_KEY_PUBLIC, &xpub);
 
     if (strcmp(xpub, expected_xpub.c_str()) != 0) {
diff --git a/seedtool/ur.ino b/seedtool/ur.ino
index 62c85b9..e35da67 100644
--- a/seedtool/ur.ino
+++ b/seedtool/ur.ino
@@ -23,10 +23,10 @@ bool crypto_coin_info(class CborWriter &writer, NetwtorkType network) {
     writer.writeInt(network == MAINNET ? 0 : 1);
 }
 
-bool crypto_keypath(class CborWriter &writer, uint32_t *derivation, uint32_t derivation_len, uint32_t parent_fingerprint) {
+bool crypto_keypath(class CborWriter &writer, uint32_t *derivation, uint32_t derivation_len, uint32_t fingerprint) {
     // crypto-keypath:
     writer.writeTag(304);
-    writer.writeMap(2);
+    writer.writeMap(3);
       writer.writeInt(1);
       writer.writeArray(derivation_len*2);
       uint32_t indx;
@@ -43,7 +43,80 @@ bool crypto_keypath(class CborWriter &writer, uint32_t *derivation, uint32_t der
         }
       }
       writer.writeInt(2);
-      writer.writeInt(parent_fingerprint);
+      writer.writeInt(fingerprint);
+
+      writer.writeInt(3);
+      writer.writeInt(derivation_len);
+}
+
+size_t cbor_encode_output_descriptor(struct ext_key *key, uint8_t **buff_out, uint32_t parent_fingerprint, uint32_t *derivation, uint32_t derivation_len) {
+
+    // ATM lethekit only supports single native segwit output descriptor (wpkh)
+    stdDerivation path;
+    if (keystore.is_standard_derivation_path(&path) != true && path != SINGLE_NATIVE_SEGWIT) {
+        Serial.println("error: only single native segwit supported atm!");
+        return 0;
+    }
+
+    CborDynamicOutput output;
+    CborWriter writer(output);
+
+    writer.writeTag(404); // witness-public-key-hash
+    writer.writeTag(303); // crypto-hdkey
+
+    writer.writeMap(5);
+
+    writer.writeInt(3);
+    writer.writeBytes(key->pub_key, sizeof(key->pub_key));
+    writer.writeInt(4);
+    writer.writeBytes(key->chain_code, sizeof(key->chain_code));
+
+    // origin: crypto-keypath
+    writer.writeInt(6);
+    writer.writeTag(304);
+    writer.writeMap(2);
+      writer.writeInt(1);
+      writer.writeArray(derivation_len*2);
+      uint32_t indx;
+      for (size_t i=0; i< derivation_len; i++) {
+        indx = derivation[i] & ~BIP32_INITIAL_HARDENED_CHILD;
+        writer.writeInt(indx);
+        if (keystore.is_bip32_indx_hardened(derivation[i])) {
+          uint32_t cbor_true = 21;
+          writer.writeSpecial(cbor_true);
+        }
+        else {
+          uint32_t cbor_false = 20;
+          writer.writeSpecial(cbor_false);
+        }
+      }
+      writer.writeInt(2);
+      writer.writeInt(keystore.fingerprint);
+
+    // children: crypto-keypath
+    writer.writeInt(7);
+    writer.writeTag(304);
+    writer.writeMap(1);
+      writer.writeInt(1);
+      writer.writeArray(2*2);
+
+
+      uint32_t cbor_false = 20;
+      uint32_t cbor_true = 21;
+      writer.writeInt(0); // for now show only "receive" descriptor supported, without "change" descriptor
+      writer.writeSpecial(cbor_false);
+
+      writer.writeArray(0);  // denotes a star /*  (for all children)
+      writer.writeSpecial(cbor_false);
+
+
+    writer.writeInt(8);
+    writer.writeInt(parent_fingerprint);
+
+    *buff_out = (uint8_t *)malloc(output.getSize());
+    memcpy(*buff_out, output.getData(), output.getSize());
+
+    return output.getSize();
 }
 
 size_t cbor_encode_hdkey_xpub(struct ext_key *key, uint8_t **buff_out, uint32_t parent_fingerprint, uint32_t *derivation, uint32_t derivation_len) {
@@ -52,9 +125,9 @@ size_t cbor_encode_hdkey_xpub(struct ext_key *key, uint8_t **buff_out, uint32_t
     CborWriter writer(output);
 
     if (network.get_network() == MAINNET)
-        writer.writeMap(3);
-    else
         writer.writeMap(4);
+    else
+        writer.writeMap(5);
     writer.writeInt(3);
     writer.writeBytes(key->pub_key, sizeof(key->pub_key));
     writer.writeInt(4);
@@ -68,7 +141,49 @@ size_t cbor_encode_hdkey_xpub(struct ext_key *key, uint8_t **buff_out, uint32_t
           writer.writeInt(1);
     }
     writer.writeInt(6);
-    crypto_keypath(writer, derivation, derivation_len, parent_fingerprint);
+    crypto_keypath(writer, derivation, derivation_len, keystore.fingerprint);
+
+    writer.writeInt(8);
+    writer.writeInt(parent_fingerprint);
+
+    *buff_out = (uint8_t *)malloc(output.getSize());
+    memcpy(*buff_out, output.getData(), output.getSize());
+
+    return output.getSize();
+}
+
+size_t cbor_encode_hdkey_xpriv(struct ext_key *key, uint8_t **buff_out, uint32_t parent_fingerprint, uint32_t *derivation, uint32_t derivation_len) {
+
+    CborDynamicOutput output;
+    CborWriter writer(output);
+
+    if (network.get_network() == MAINNET)
+        writer.writeMap(5);
+    else
+        writer.writeMap(6);
+
+    // is_private
+    writer.writeInt(2);
+    uint32_t cbor_true = 21;
+    writer.writeSpecial(cbor_true);
+
+    writer.writeInt(3);
+    writer.writeBytes(key->priv_key, sizeof(key->priv_key));
+    writer.writeInt(4);
+    writer.writeBytes(key->chain_code, sizeof(key->chain_code));
+    // crypto-coininfo
+    if (network.get_network() != MAINNET) {
+        writer.writeInt(5);
+        writer.writeTag(305);
+          writer.writeMap(1);
+          writer.writeInt(2);
+          writer.writeInt(1);
+    }
+    writer.writeInt(6);
+    crypto_keypath(writer, derivation, derivation_len, keystore.fingerprint);
+
+    writer.writeInt(8);
+    writer.writeInt(parent_fingerprint);
 
     *buff_out = (uint8_t *)malloc(output.getSize());
     memcpy(*buff_out, output.getData(), output.getSize());
@@ -186,6 +301,38 @@ bool ur_encode_hd_pubkey_xpub(String &xpub_bytewords, uint32_t *derivation, uint
     return true;
 }
 
+bool ur_encode_hd_pubkey_xpriv(String &xpriv_bytewords, uint32_t *derivation, uint32_t derivation_len) {
+    bool retval;
+    ext_key xpriv;
+    uint8_t *cbor_xpriv = NULL;
+
+    (void)bip32_key_from_parent_path(&keystore.root, derivation, derivation_len, BIP32_FLAG_KEY_PRIVATE, &xpriv);
+
+    uint32_t parent_fingerprint;
+    ((uint8_t *)&parent_fingerprint)[0] = xpriv.parent160[3];
+    ((uint8_t *)&parent_fingerprint)[1] = xpriv.parent160[2];
+    ((uint8_t *)&parent_fingerprint)[2] = xpriv.parent160[1];
+    ((uint8_t *)&parent_fingerprint)[3] = xpriv.parent160[0];
+
+    size_t cbor_xpriv_size = cbor_encode_hdkey_xpriv(&xpriv, &cbor_xpriv, parent_fingerprint, derivation, derivation_len);
+    if (cbor_xpriv_size == 0) {
+        return false;
+    }
+
+    //Serial.println("cbor xpriv:");
+    //print_hex(cbor_xpriv, cbor_xpriv_size);
+
+    retval = ur_encode("crypto-hdkey", cbor_xpriv, cbor_xpriv_size, xpriv_bytewords);
+    if (retval == false) {
+        return false;
+    }
+
+    // @FIXME: free also on premature exit
+    free(cbor_xpriv);
+
+    return true;
+}
+
 bool ur_encode_crypto_seed(uint8_t *seed, size_t seed_len, String &seed_ur, uint32_t *unix_timestamp) {
     bool retval;
     uint8_t *cbor_seed = NULL;
@@ -243,7 +390,10 @@ bool ur_encode_output_descriptor(String &ur, uint32_t *derivation, uint32_t deri
     writer.writeTag(404); // @FIXME currently fixed ton only wpkh (404)
 
     (void)bip32_key_from_parent_path(&keystore.root, derivation, derivation_len, 0, &child_key);
-    cbor_size = cbor_encode_hdkey_xpub(&child_key, &buff_out, parent_fingerprint, derivation, derivation_len);
+    cbor_size = cbor_encode_output_descriptor(&child_key, &buff_out, parent_fingerprint, derivation, derivation_len);
+
+    Serial.println("cbor output descriptor:");
+    print_hex(buff_out, cbor_size);
 
     uint8_t *cbor_all = (uint8_t *)malloc(cbor_size + output.getSize());
     memcpy(cbor_all, output.getData(), output.getSize());
@@ -299,57 +449,5 @@ bool test_ur(void) {
           return false;
         }
     }
-    {
-        // https://github.com/BlockchainCommons/Research/blob/master/papers/bcr-2020-007-hdkey.md#exampletest-vector-2
-        String path = F("m/44h/1h/1h/0/1");
-        String derived_key = F("tpubDHW3GtnVrTatx38EcygoSf9UhUd9Dx1rht7FAL8unrMo8r2NWhJuYNqDFS7cZFVbDaxJkV94MLZAr86XFPsAPYcoHWJ7sWYsrmHDw5sKQ2K");
-        String cbor_expected = F("a4035821026fe2355745bb2db3630bbc80ef5d58951c963c841f54170ba6e5c12be7fc12a6045820ced155c72456255881793514edc5"
-                               "bd9447e7f74abb88c6d6b6480fd016ee8c8505d90131a1020106d90130a2018a182cf501f501f500f401f4021ae9181cf3");
-        String ur_expect = F("ur:crypto-hdkey/oxaxhdclaojlvoechgferkdpqdiabdrflawshlhdmdcemtfnlrctghchbdolvwsednvdztbgolaahdcxtot"
-                             "tgostdkhfdahdlykkecbbweskrymwflvdylgerkloswtbrpfdbsticmwylklpahtaadehoyaoadamtaaddyoeadlecsdwykadyk"
-                             "adykaewkadwkaocywlcscewfiavorkat");
-        uint32_t parent_fingerprint = 3910671603;
-        ext_key xpub;
-        uint8_t *cbor_xpub;
-        String xpub_ur;
-
-        // STUB derivation path
-        keystore.check_derivation_path(path.c_str(), true);
-
-        ret = bip32_key_from_base58(derived_key.c_str(), &xpub);
-        if (ret != WALLY_OK) {
-            Serial.println(F("bip32_key_from_base58 failed"));
-            return false;
-        }
-
-        size_t cbor_xpub_size = cbor_encode_hdkey_xpub(&xpub, &cbor_xpub, parent_fingerprint, keystore.derivation, keystore.derivationLen);
-        if (cbor_xpub_size == 0) {
-            Serial.println(F("cbor_encode_hdkey_xpub failed"));
-            return false;
-        }
-
-        bool retval = compare_bytes_with_hex(cbor_xpub, cbor_xpub_size, cbor_expected.c_str());
-        if (retval == false) {
-            Serial.println(F("key in cbor format does not match expected value"));
-            return false;
-        }
-
-        retval = ur_encode("crypto-hdkey", cbor_xpub, cbor_xpub_size, xpub_ur);
-        if (retval == false) {
-            Serial.println(F("ur encode: crypto-hdkey failed"));
-            return false;
-        }
-
-        if (ur_expect != xpub_ur) {
-            Serial.println(F("ur encode: crypto-hdkey wrong"));
-            //Serial.println(xpub_ur);
-            return false;
-        }
-        free(cbor_xpub);
-
-        // CLEAN STUB
-        stdDerivation stdDer = SINGLE_NATIVE_SEGWIT;
-        keystore.save_standard_derivation_path(&stdDer, network.get_network());
-    }
     return true;
 }
diff --git a/seedtool/userinterface.h b/seedtool/userinterface.h
index 03aa0d2..d588dff 100644
--- a/seedtool/userinterface.h
+++ b/seedtool/userinterface.h
@@ -19,7 +19,7 @@ enum UIState {
     DISPLAY_BIP39,
     CONFIG_SSKR,
     DISPLAY_SSKR,
-    DISPLAY_XPUBS,
+    DISPLAY_KEYS,
     DERIVATION_PATH,
     SET_NETWORK,
     SET_XPUB_FORMAT,
@@ -81,7 +81,8 @@ struct pg_xpub_menu_t {
 struct pg_set_xpub_options_t {
     bool slip132;
     bool show_derivation_path;
-    bool current; // currently selected option out of 2
+    bool show_private_key;
+    uint8_t current; // currently selected option out of 3
 };
 
 struct pg_set_seed_format_t {
@@ -92,4 +93,8 @@ struct pg_set_sskr_format_t {
     format sskr_format;
 };
 
+struct pg_seedless_menu_t {
+    bool allow_invalid_mnemonic;
+};
+
 #endif // USERINTERFACE_H
diff --git a/seedtool/userinterface.ino b/seedtool/userinterface.ino
index e9ec2d6..8655e6c 100644
--- a/seedtool/userinterface.ino
+++ b/seedtool/userinterface.ino
@@ -74,14 +74,15 @@ int const YM_FMB12 = 4;	// y-margin
 bool clear_full_window = true;
 
 // Pages
-struct pg_show_address_t pg_show_address{0, ur};
-struct pg_export_wallet_t pg_export_wallet{ur};
+struct pg_show_address_t pg_show_address{0, qr_ur};
+struct pg_export_wallet_t pg_export_wallet{qr_ur};
 struct pg_derivation_path_t pg_derivation_path{true, SINGLE_NATIVE_SEGWIT};
-struct pg_set_xpub_format_t pg_set_xpub_format{ur};
+struct pg_set_xpub_format_t pg_set_xpub_format{qr_ur};
 struct pg_xpub_menu_t pg_xpub_menu = {false};
-struct pg_set_xpub_options_t pg_set_xpub_options = {false, false};
-struct pg_set_seed_format_t pg_set_seed_format = {ur};
+struct pg_set_xpub_options_t pg_set_xpub_options = {false, false, 0};
+struct pg_set_seed_format_t pg_set_seed_format = {qr_ur};
 struct pg_set_sskr_format_t pg_set_sskr_format = {ur};
+struct pg_seedless_menu_t pg_seedless_menu = {false};
 
 Point text_center(const char * txt) {
     int16_t tbx, tby; uint16_t tbw, tbh;
@@ -361,7 +362,7 @@ void self_test() {
         if (ndx < numtests)
             last_test_passed = selftest_testrun(ndx);
     }
-    delay(1000);		// short pause ..
+    delay(500);		// short pause ..
     hw_green_led(LOW);	// Green LED back off until there is a seed.
     g_uistate = INTRO_SCREEN;
 }
@@ -442,12 +443,12 @@ void seedless_menu() {
         g_display->setTextColor(GxEPD_BLACK);
 
         int xx = xoff;
-        int yy = yoff + (H_FSB12 + YM_FSB12);
+        int yy = (H_FSB12 + YM_FSB12);
         g_display->setFont(&FreeSansBold12pt7b);
         g_display->setCursor(xx, yy);
         g_display->println("No Seed");
 
-        yy = yoff + 3*(H_FSB9 + YM_FSB9);
+        yy = 3*(H_FSB9 + YM_FSB9);
         g_display->setFont(&FreeSansBold9pt7b);
         g_display->setCursor(xx, yy);
         g_display->println("A - Generate Seed");
@@ -459,6 +460,9 @@ void seedless_menu() {
         g_display->println("C - Restore SSKR");
         yy += H_FSB9 + 2*YM_FSB9;
         g_display->setCursor(xx, yy);
+        g_display->println("D - Complete BIP39");
+        yy += H_FSB9 + 2*YM_FSB9;
+        g_display->setCursor(xx, yy);
         // TODO: only for demonstration purposes, to be deleted
         g_display->println("0 - UR Demo");
 
@@ -484,18 +488,34 @@ void seedless_menu() {
             g_uistate = RESTORE_BIP39;
             return;
         case 'C':
+            pg_seedless_menu.allow_invalid_mnemonic = false;
             g_sskr_restore = new SSKRShareSeq();
             g_uistate = RESTORE_SSKR;
             return;
         case '0':
             g_uistate = UR_DEMO;
             return;
+        case 'D':
+            // allow inputting invalid mnemonic
+            pg_seedless_menu.allow_invalid_mnemonic = true;
+            g_bip39 = new BIP39Seq();
+            g_uistate = RESTORE_BIP39;
+            return;
         default:
             break;
         }
     }
 }
 
+void pendingCallback(const void*)
+{
+  String txt = "One moment...";
+  Point p = text_center(txt.c_str());
+  g_display->fillScreen(GxEPD_WHITE);
+  g_display->setCursor(p.x, p.y);
+  g_display->println(txt);
+}
+
 void generate_seed() {
     while (true) {
         int xoff = 14;
@@ -591,7 +611,7 @@ void generate_seed() {
             // This will take a few seconds; clear the screen
             // immediately to let the user know something is
             // happening ..
-            full_window_clear();
+            g_display->drawPaged(pendingCallback, 0);
 
             if (g_bip39)
                 delete g_bip39;
@@ -725,7 +745,7 @@ void seedy_menu() {
         g_display->println("B - Generate SSKR");
         yy += H_FSB9 + 2*YM_FSB9;
         g_display->setCursor(xx, yy);
-        g_display->println("C - Display XPUB");
+        g_display->println("C - Display keys");
         yy += H_FSB9 + 2*YM_FSB9;
         g_display->setCursor(xx, yy);
         g_display->println("D - Display seed");
@@ -762,7 +782,7 @@ void seedy_menu() {
             return;
         case 'C':
             clear_full_window = false;
-            g_uistate = DISPLAY_XPUBS;
+            g_uistate = DISPLAY_KEYS;
             return;
         case '0':
             clear_full_window = false;
@@ -1365,6 +1385,113 @@ struct BIP39WordlistState : WordListState {
     }
 };
 
+
+// returns true if user wants bad checksum to get automatically fixed
+bool complete_bip39_checksum(void) {
+
+    int xoff = 6;
+    int yoff = 6;
+
+    g_display->firstPage();
+    do
+    {
+        g_display->setPartialWindow(0, 0, 200, 200);
+        // g_display->fillScreen(GxEPD_WHITE);
+        g_display->setTextColor(GxEPD_BLACK);
+
+        int xx = xoff;
+        int yy = yoff + (H_FSB9 + YM_FSB9);
+        g_display->setFont(&FreeSansBold9pt7b);
+        g_display->setCursor(xx, yy);
+        display_printf("    Complete BIP39 \n          sentence?");
+        yy += H_FSB9 + YM_FSB9+20;
+
+        g_display->setFont(&FreeMono9pt7b);
+        g_display->setCursor(xx, yy);
+        display_long_text(yy, "Confirm only if  your words were  generated by a   random procedure,i.e. tossing coi-ns.");
+
+        yy = 195; // Absolute, stuck to bottom
+        g_display->setFont(&FreeMono9pt7b);
+        String right_option = "Ok #";
+        int x_r = text_right(right_option.c_str());
+        g_display->setCursor(x_r, yy);
+        g_display->println(right_option);
+
+        String left_option = "Cancel *";
+        g_display->setCursor(0, yy);
+        g_display->println(left_option);
+    }
+    while (g_display->nextPage());
+
+    while (true) {
+        char key;
+        do {
+            key = g_keypad.getKey();
+        } while (key == NO_KEY);
+        switch (key) {
+        case '*':
+            return false;
+        case '#':
+            return true;
+        default:
+            break;
+        }
+    }
+}
+
+bool warning_bip39_checksum(void) {
+
+    int xoff = 6;
+    int yoff = 6;
+
+    g_display->firstPage();
+    do
+    {
+        g_display->setPartialWindow(0, 0, 200, 200);
+        // g_display->fillScreen(GxEPD_WHITE);
+        g_display->setTextColor(GxEPD_BLACK);
+
+        int xx = xoff;
+        int yy = yoff + (H_FSB9 + YM_FSB9);
+        g_display->setFont(&FreeSansBold9pt7b);
+        Point p = text_center("Warning");
+        g_display->setCursor(p.x, yy);
+        display_printf("Warning");
+        yy += H_FSB9 + YM_FSB9+20;
+
+        g_display->setFont(&FreeMono9pt7b);
+        g_display->setCursor(xx, yy);
+        display_long_text(yy, "Have you updated the last word on your sheet to ma-tch the one gene-rated by Lethe-\n Kit?");
+
+        yy = 195; // Absolute, stuck to bottom
+        g_display->setFont(&FreeMono9pt7b);
+        String right_option = "Yes #";
+        int x_r = text_right(right_option.c_str());
+        g_display->setCursor(x_r, yy);
+        g_display->println(right_option);
+
+        String left_option = "No *";
+        g_display->setCursor(0, yy);
+        g_display->println(left_option);
+    }
+    while (g_display->nextPage());
+
+    while (true) {
+        char key;
+        do {
+            key = g_keypad.getKey();
+        } while (key == NO_KEY);
+        switch (key) {
+        case '*':
+            return false;
+        case '#':
+            return true;
+        default:
+            break;
+        }
+    }
+}
+
 void restore_bip39() {
     BIP39WordlistState state(g_bip39, BIP39Seq::WORD_COUNT);
     state.set_words((uint16_t *)NULL);
@@ -1493,12 +1620,15 @@ void restore_bip39() {
             break;
         case '#':	// done
             {
+                g_display->drawPaged(pendingCallback, 0);
                 uint16_t bip39_words[BIP39Seq::WORD_COUNT];
                 for (size_t ii = 0; ii < BIP39Seq::WORD_COUNT; ++ii)
                     bip39_words[ii] = state.wordndx[ii];
                 BIP39Seq * bip39 = BIP39Seq::from_words(bip39_words);
                 Seed * seed = bip39->restore_seed();
                 if (seed) {
+                    if (pg_seedless_menu.allow_invalid_mnemonic && warning_bip39_checksum() == false)
+                        break;
                     serial_assert(!g_master_seed);
                     g_master_seed = seed;
                     g_master_seed->log();
@@ -1507,7 +1637,15 @@ void restore_bip39() {
                     digitalWrite(GREEN_LED, HIGH);		// turn on green LED
                     g_uistate = SEEDY_MENU;
                     return;
-                } else {
+                } else if (pg_seedless_menu.allow_invalid_mnemonic) {
+                    if (complete_bip39_checksum() == true) {
+                      bip39->fix_bip39_checksum();
+                      for (size_t ii = 0; ii < BIP39Seq::WORD_COUNT; ++ii)
+                          state.wordndx[ii] = bip39->get_word(ii);
+                    }
+                    delete bip39;
+                }
+                else {
                     delete bip39;
                     String lines[7];
                     size_t nlines = 0;
@@ -1518,7 +1656,7 @@ void restore_bip39() {
                     lines[nlines++] = "list carefully";
                     lines[nlines++] = "";
                     lines[nlines++] = "Press # to revisit";
-                    interstitial_error(lines, nlines);
+                    interstitial_error(lines, nlines);       
                 }
                 break;
             }
@@ -1885,14 +2023,14 @@ void derivation_path(void) {
           g_display->setCursor(p.x, yy);
           g_display->println(title);
 
-          yy += 50;
-          display_text("A: native segwit", x_off, yy, pg_derivation_path.std_derivation == SINGLE_NATIVE_SEGWIT && pg_derivation_path.is_standard_derivation, 0);
 
-          yy += 30;
-          display_text("B: nested segwit", x_off, yy, pg_derivation_path.std_derivation == SINGLE_NESTED_SEGWIT && pg_derivation_path.is_standard_derivation, 0);
+          display_text("A: native segwit", x_off, yy += 50, pg_derivation_path.std_derivation == SINGLE_NATIVE_SEGWIT && pg_derivation_path.is_standard_derivation, 0);
 
-          yy += 30;
-          display_text("C: custom", x_off, yy, pg_derivation_path.is_standard_derivation == false, 0);
+          display_text("B: nested segwit", x_off, yy += 30, pg_derivation_path.std_derivation == SINGLE_NESTED_SEGWIT && pg_derivation_path.is_standard_derivation, 0);
+
+          display_text("C: cosigner", x_off, yy += 30, pg_derivation_path.std_derivation == MULTISIG_NATIVE_SEGWIT && pg_derivation_path.is_standard_derivation, 0);
+
+          display_text("D: custom", x_off, yy += 30, pg_derivation_path.is_standard_derivation == false, 0);
 
           yy = 195; // Absolute, stuck to bottom
           g_display->setFont(&FreeMono9pt7b);
@@ -1914,10 +2052,10 @@ void derivation_path(void) {
 
       switch (key) {
         case '#':
-            g_uistate = DISPLAY_XPUBS;
+            g_uistate = DISPLAY_KEYS;
             return;
         case '*':
-            g_uistate = DISPLAY_XPUBS;
+            g_uistate = DISPLAY_KEYS;
             return;
         case 'A': {
             pg_derivation_path.std_derivation = SINGLE_NATIVE_SEGWIT;
@@ -1928,7 +2066,7 @@ void derivation_path(void) {
                 return;
               }
             }
-            g_uistate = DISPLAY_XPUBS;
+            g_uistate = DISPLAY_KEYS;
             return;
         case 'B': {
             pg_derivation_path.std_derivation = SINGLE_NESTED_SEGWIT;
@@ -1939,9 +2077,20 @@ void derivation_path(void) {
                 return;
               }
             }
-            g_uistate = DISPLAY_XPUBS;
+            g_uistate = DISPLAY_KEYS;
             return;
-        case 'C':
+        case 'C': {
+            pg_derivation_path.std_derivation = MULTISIG_NATIVE_SEGWIT;
+            pg_derivation_path.is_standard_derivation = true;
+            ret = keystore.save_standard_derivation_path(&pg_derivation_path.std_derivation, network.get_network());
+            if (ret == false) {
+                g_uistate = ERROR_SCREEN;
+                return;
+              }
+            }
+            g_uistate = DISPLAY_KEYS;
+            return;
+        case 'D':
             // slip132 option is not available for custom derivation paths
             pg_set_xpub_options.slip132 = false;
             pg_derivation_path.is_standard_derivation = false;
@@ -2025,7 +2174,7 @@ void custom_derivation_path(void) {
                     g_uistate = ERROR_SCREEN;
                     return;
                 }
-                g_uistate = DISPLAY_XPUBS;
+                g_uistate = DISPLAY_KEYS;
                 return;
             }
             break;
@@ -2101,7 +2250,7 @@ void set_xpub_format() {
     do {
         key = g_keypad.getKey();
     } while (key == NO_KEY);
-    g_uistate = DISPLAY_XPUBS;
+    g_uistate = DISPLAY_KEYS;
     clear_full_window = false;
     switch (key) {
     case 'A':
@@ -2145,19 +2294,28 @@ void set_xpub_options() {
         g_display->setCursor(xx, yy);
         g_display->println("slip132: ");
 
-        display_text(pg_set_xpub_options.slip132 ? "True" : "False", xx + 80, yy, pg_set_xpub_options.current == true);
+        display_text(pg_set_xpub_options.slip132 ? "True" : "False", xx + 80, yy, pg_set_xpub_options.current == 0);
         g_display->setTextColor(GxEPD_BLACK);
 
-        yy += H_FSB9 + YM_FSB9;
+        //yy += H_FSB9 + YM_FSB9;
 
 
-        yy += H_FSB9 + 2*YM_FSB9 + 5;
+        yy += H_FSB9 + 2*YM_FSB9;
         g_display->setCursor(xx, yy);
         g_display->println("show path: ");
 
-        display_text(pg_set_xpub_options.show_derivation_path ? "True" : "False", xx + 100, yy, pg_set_xpub_options.current == false);
+        display_text(pg_set_xpub_options.show_derivation_path ? "True" : "False", xx + 100, yy, pg_set_xpub_options.current == 1);
         g_display->setTextColor(GxEPD_BLACK);
 
+
+        yy += H_FSB9 + 2*YM_FSB9;
+        g_display->setCursor(xx, yy);
+        g_display->println("show privkey: ");
+
+        display_text(pg_set_xpub_options.show_private_key ? "True" : "False", xx + 130, yy, pg_set_xpub_options.current == 2);
+        g_display->setTextColor(GxEPD_BLACK);
+
+
         yy = 195; // Absolute, stuck to bottom
         g_display->setFont(&FreeMono9pt7b);
         String right_option = "# Done";
@@ -2175,14 +2333,16 @@ void set_xpub_options() {
     do {
         key = g_keypad.getKey();
     } while (key == NO_KEY);
-    g_uistate = DISPLAY_XPUBS;
+    g_uistate = DISPLAY_KEYS;
     clear_full_window = false;
     switch (key) {
     case 'A':
-        if (pg_set_xpub_options.current)
+        if (pg_set_xpub_options.current == 0)
             pg_set_xpub_options.slip132 = !pg_set_xpub_options.slip132;
-        else
+        else if (pg_set_xpub_options.current == 1)
             pg_set_xpub_options.show_derivation_path = !pg_set_xpub_options.show_derivation_path;
+        else if (pg_set_xpub_options.current == 2)
+            pg_set_xpub_options.show_private_key = !pg_set_xpub_options.show_private_key;
         g_uistate = SET_XPUB_OPTIONS;
         break;
     case '*':
@@ -2190,7 +2350,9 @@ void set_xpub_options() {
     case '#':
         return;
     case '1':
-        pg_set_xpub_options.current = !pg_set_xpub_options.current;
+        pg_set_xpub_options.current++;
+        if (pg_set_xpub_options.current > 2)
+            pg_set_xpub_options.current = 0;
         g_uistate = SET_XPUB_OPTIONS;
         break;
     default:
@@ -2199,9 +2361,11 @@ void set_xpub_options() {
     }
 }
 
-void display_xpub(void) {
+void display_keys(void) {
     ext_key key;
     String ur_string;
+    String ur_xpriv_string;
+    String ur_xpub_string;
     String encoding_type;
     const int nrows = 5;
     int scroll = 0;
@@ -2215,12 +2379,13 @@ void display_xpub(void) {
         return;
     }
 
-    ret = keystore.get_xpub(&key);
+    ret = keystore.get_xpriv(&key);
     if (ret == false) {
         g_uistate = ERROR_SCREEN;
         return;
     }
 
+    char *hdkey = NULL;
     char *xpub = NULL;
     ret = keystore.xpub_to_base58(&key, &xpub, pg_set_xpub_options.slip132);
     if (ret == false) {
@@ -2228,13 +2393,36 @@ void display_xpub(void) {
         return;
     }
 
-    ret = ur_encode_hd_pubkey_xpub(ur_string, keystore.derivation, keystore.derivationLen);
+    char *xpriv = NULL;
+    ret = keystore.xpriv_to_base58(&key, &xpriv, pg_set_xpub_options.slip132);
+    if (ret == false) {
+        g_uistate = ERROR_SCREEN;
+        return;
+    }
+
+    ret = ur_encode_hd_pubkey_xpub(ur_xpub_string, keystore.derivation, keystore.derivationLen);
+    if (ret == false) {
+        g_uistate = ERROR_SCREEN;
+        return;
+    }
+
+    ret = ur_encode_hd_pubkey_xpriv(ur_xpriv_string, keystore.derivation, keystore.derivationLen);
     if (ret == false) {
         g_uistate = ERROR_SCREEN;
         return;
     }
 
     while (true) {
+
+     if (pg_set_xpub_options.show_private_key) {
+         ur_string = ur_xpriv_string;
+         hdkey = xpriv;
+     }
+     else {
+         ur_string = ur_xpub_string;
+         hdkey = xpub;
+     }
+
       g_display->firstPage();
       do
       {
@@ -2242,7 +2430,8 @@ void display_xpub(void) {
           g_display->fillScreen(GxEPD_WHITE);
           g_display->setTextColor(GxEPD_BLACK);
 
-          const char * title = "Master pubkey";
+          const char * title = pg_set_xpub_options.show_private_key ? "Xpriv": "Xpub";
+
           int yy = 18;
           g_display->setFont(&FreeSansBold9pt7b);
           Point p = text_center(title);
@@ -2256,7 +2445,7 @@ void display_xpub(void) {
                 if (pg_set_xpub_options.show_derivation_path) {
                     char fingerprint[9] = {0};
                     sprintf(fingerprint, "%08x", (unsigned int)keystore.fingerprint);
-                    String txt = "[" + String(fingerprint) + keystore.get_derivation_path().substring(1) + "]" + String(xpub);
+                    String txt = "[" + String(fingerprint) + keystore.get_derivation_path().substring(1) + "]" + String(hdkey);
                     for (int k = 0; k < nrows; ++k) {
                         g_display->setCursor(5, yy);
                         display_printf("%s", txt.substring((k + scroll)*scroll_strlen, (1+k + scroll)*scroll_strlen).c_str());
@@ -2264,18 +2453,18 @@ void display_xpub(void) {
                     }
                 }
                 else {
-                    display_long_text(yy, xpub);
+                    display_long_text(yy, hdkey);
                 }
                 break;
             case qr_text:
                 if (pg_set_xpub_options.show_derivation_path) {
                     char fingerprint[9] = {0};
                     sprintf(fingerprint, "%08x", (unsigned int)keystore.fingerprint);
-                    String fing = "[" + String(fingerprint) + keystore.get_derivation_path().substring(1) + "]" + String(xpub);
+                    String fing = "[" + String(fingerprint) + keystore.get_derivation_path().substring(1) + "]" + String(hdkey);
                     displayQR((char *)fing.c_str());
                 }
                 else {
-                    displayQR(xpub);
+                    displayQR(hdkey);
                 }
                 break;
             case ur: {
@@ -2320,7 +2509,7 @@ void display_xpub(void) {
              left_option = "<-1/7->";
              g_display->println(left_option);
          }
-         else if (pg_set_xpub_format.current == text || pg_set_xpub_format.current == qr_text) {
+         else {//if (pg_set_xpub_format.current == text || pg_set_xpub_format.current == qr_text) {
              left_option = "Opt. B";
              g_display->setCursor(0, yy);
              g_display->println(left_option);
@@ -3181,8 +3370,8 @@ void ui_dispatch() {
     case DISPLAY_SSKR:
         display_sskr();
         break;
-    case DISPLAY_XPUBS:
-        display_xpub();
+    case DISPLAY_KEYS:
+        display_keys();
         break;
     case DERIVATION_PATH:
         derivation_path();