diff --git a/Layouts/tabs layout/index.html b/Layouts/tabs layout/index.html
index ff62f89..d131243 100644
--- a/Layouts/tabs layout/index.html	
+++ b/Layouts/tabs layout/index.html	
@@ -144,246 +144,251 @@
     <script src="js/main_UI.js"></script>
     <script src="js/components.min.js"></script>
     <script id="floGlobals">
-        /* Constants for FLO blockchain operations !!Make sure to add this at begining!! */
-        const floGlobals = {
+    /* Constants for FLO blockchain operations !!Make sure to add this at begining!! */
+    const floGlobals = {
 
-            //Required for all
-            blockchain: "FLO",
+        //Required for all
+        blockchain: "FLO",
 
-            //Required for blockchain API operators
-            apiURL: {
-                FLO: ['https://livenet.flocha.in/', 'https://flosight.duckdns.org/'
-                ],
-                FLO_TEST: ['https://testnet-flosight.duckdns.org/', 'https://testnet.flocha.in/']
+        //Required for blockchain API operators
+        apiURL: {
+            FLO: ['https://livenet.flocha.in/', 'https://flosight.duckdns.org/'],
+            FLO_TEST: ['https://testnet-flosight.duckdns.org/', 'https://testnet.flocha.in/']
+        },
+        adminID: "FKAEdnPfjXLHSYwrXQu377ugN4tXU7VGdf",
+        sendAmt: 0.001,
+        fee: 0.0005,
+
+        //Required for Supernode operations
+        SNStorageID: "FNaN9McoBAEFUjkRmNQRYLmBF8SpS7Tgfk",
+        supernodes: {}, //each supnernode must be stored as floID : {uri:<uri>,pubKey:<publicKey>}
+
+        //for cloud apps
+        subAdmins: [],
+        application: "TEST_MODE",
+        appObjects: {},
+        generalData: {},
+        lastVC: {}
+    }
+</script>
+<script id="onLoadStartUp">
+    function onLoadStartUp() {
+
+        //floDapps.addStartUpFunction('Sample', Promised Function)
+        //floDapps.setAppObjectStores({sampleObs1:{}, sampleObs2:{options{autoIncrement:true, keyPath:'SampleKey'}, Indexes:{sampleIndex:{}}}})
+        //floDapps.setCustomPrivKeyInput( () => { FUNCTION BODY *must resolve private key* } )
+
+        floDapps.launchStartUp().then(result => {
+            console.log(result)
+            alert(`Welcome FLO_ID: ${myFloID}`)
+            //App functions....
+        }).catch(error => console.error(error))
+    }
+</script>
+</head>
+
+<body onload="onLoadStartUp()">
+    TEST_MODE
+  (use console)
+
+<script id="init_lib" version="1.0.1">
+    //All util libraries required for Standard operations (DO NOT EDIT ANY)
+
+      /* Reactor Event handling */
+  if (typeof reactor == "undefined" || !reactor) {
+    (function () {
+      function Event(name) {
+        this.name = name;
+        this.callbacks = [];
+      }
+
+      Event.prototype.registerCallback = function (callback) {
+        this.callbacks.push(callback);
+      };
+
+      function Reactor() {
+        this.events = {};
+      }
+
+      Reactor.prototype.registerEvent = function (eventName) {
+        var event = new Event(eventName);
+        this.events[eventName] = event;
+      };
+
+      Reactor.prototype.dispatchEvent = function (eventName, eventArgs) {
+        this.events[eventName].callbacks.forEach(function (callback) {
+          callback(eventArgs);
+        });
+      };
+
+      Reactor.prototype.addEventListener = function (eventName, callback) {
+        this.events[eventName].registerCallback(callback);
+      };
+
+      window.reactor = new Reactor();
+    })();
+  }
+
+  /* Sample Usage
+    --Creating and defining the event--
+    reactor.registerEvent('<eventName>');
+    reactor.addEventListener('<eventName>', function(someObject){
+      do something...
+    });
+    --Firing the event--
+    reactor.dispatchEvent('<eventName>',<someObject>);
+  */
+
+  
+/*!
+* Crypto-JS v2.5.4  Crypto.js
+* http://code.google.com/p/crypto-js/
+* Copyright (c) 2009-2013, Jeff Mott. All rights reserved.
+* http://code.google.com/p/crypto-js/wiki/License
+*/
+if (typeof Crypto == "undefined" || !Crypto.util) {
+    (function () {
+
+        var base64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+        // Global Crypto object
+        var Crypto = window.Crypto = {};
+
+        // Crypto utilities
+        var util = Crypto.util = {
+
+            // Bit-wise rotate left
+            rotl: function (n, b) {
+                return (n << b) | (n >>> (32 - b));
             },
-            adminID: "FKAEdnPfjXLHSYwrXQu377ugN4tXU7VGdf",
-            sendAmt: 0.001,
-            fee: 0.0005,
 
-            //Required for Supernode operations
-            SNStorageID: "FNaN9McoBAEFUjkRmNQRYLmBF8SpS7Tgfk",
-            supernodes: {}, //each supnernode must be stored as floID : {uri:<uri>,pubKey:<publicKey>}
+            // Bit-wise rotate right
+            rotr: function (n, b) {
+                return (n << (32 - b)) | (n >>> b);
+            },
 
-            //for cloud apps
-            subAdmins: [],
-            application: "TEST_MODE",
-            appObjects: {},
-            generalData: {},
-            lastVC: {}
-        }
-    </script>
-    <script id="onLoadStartUp">
-        function onLoadStartUp() {
+            // Swap big-endian to little-endian and vice versa
+            endian: function (n) {
 
-            //floDapps.addStartUpFunction('Sample', Promised Function)
-            //floDapps.setAppObjectStores({sampleObs1:{}, sampleObs2:{options{autoIncrement:true, keyPath:'SampleKey'}, Indexes:{sampleIndex:{}}}})
-            //floDapps.setCustomPrivKeyInput( () => { FUNCTION BODY *must resolve private key* } )
-
-            floDapps.launchStartUp().then(result => {
-                console.log(result)
-                alert(`Welcome FLO_ID: ${myFloID}`)
-                //App functions....
-            }).catch(error => console.error(error))
-        }
-    </script>
-    <script id="init_lib" version="1.0.1">
-        //All util libraries required for Standard operations (DO NOT EDIT ANY)
-
-        /* Reactor Event handling */
-        if (typeof reactor == "undefined" || !reactor) {
-            (function () {
-                function Event(name) {
-                    this.name = name;
-                    this.callbacks = [];
+                // If number given, swap endian
+                if (n.constructor == Number) {
+                    return util.rotl(n, 8) & 0x00FF00FF |
+                util.rotl(n, 24) & 0xFF00FF00;
                 }
 
-                Event.prototype.registerCallback = function (callback) {
-                    this.callbacks.push(callback);
-                };
+                // Else, assume array and swap all items
+                for (var i = 0; i < n.length; i++)
+                    n[i] = util.endian(n[i]);
+                return n;
 
-                function Reactor() {
-                    this.events = {};
+            },
+
+            // Generate an array of any length of random bytes
+            randomBytes: function (n) {
+                for (var bytes = []; n > 0; n--)
+                    bytes.push(Math.floor(Math.random() * 256));
+                return bytes;
+            },
+
+            // Convert a byte array to big-endian 32-bit words
+            bytesToWords: function (bytes) {
+                for (var words = [], i = 0, b = 0; i < bytes.length; i++, b += 8)
+                    words[b >>> 5] |= (bytes[i] & 0xFF) << (24 - b % 32);
+                return words;
+            },
+
+            // Convert big-endian 32-bit words to a byte array
+            wordsToBytes: function (words) {
+                for (var bytes = [], b = 0; b < words.length * 32; b += 8)
+                    bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF);
+                return bytes;
+            },
+
+            // Convert a byte array to a hex string
+            bytesToHex: function (bytes) {
+                for (var hex = [], i = 0; i < bytes.length; i++) {
+                    hex.push((bytes[i] >>> 4).toString(16));
+                    hex.push((bytes[i] & 0xF).toString(16));
+                }
+                return hex.join("");
+            },
+
+            // Convert a hex string to a byte array
+            hexToBytes: function (hex) {
+                for (var bytes = [], c = 0; c < hex.length; c += 2)
+                    bytes.push(parseInt(hex.substr(c, 2), 16));
+                return bytes;
+            },
+
+            // Convert a byte array to a base-64 string
+            bytesToBase64: function (bytes) {
+                for (var base64 = [], i = 0; i < bytes.length; i += 3) {
+                    var triplet = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
+                    for (var j = 0; j < 4; j++) {
+                        if (i * 8 + j * 6 <= bytes.length * 8)
+                            base64.push(base64map.charAt((triplet >>> 6 * (3 - j)) & 0x3F));
+                        else base64.push("=");
+                    }
                 }
 
-                Reactor.prototype.registerEvent = function (eventName) {
-                    var event = new Event(eventName);
-                    this.events[eventName] = event;
-                };
+                return base64.join("");
+            },
 
-                Reactor.prototype.dispatchEvent = function (eventName, eventArgs) {
-                    this.events[eventName].callbacks.forEach(function (callback) {
-                        callback(eventArgs);
-                    });
-                };
+            // Convert a base-64 string to a byte array
+            base64ToBytes: function (base64) {
+                // Remove non-base-64 characters
+                base64 = base64.replace(/[^A-Z0-9+\/]/ig, "");
 
-                Reactor.prototype.addEventListener = function (eventName, callback) {
-                    this.events[eventName].registerCallback(callback);
-                };
+                for (var bytes = [], i = 0, imod4 = 0; i < base64.length; imod4 = ++i % 4) {
+                    if (imod4 == 0) continue;
+                    bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & (Math.pow(2, -2 * imod4 + 8) - 1)) << (imod4 * 2)) |
+                    (base64map.indexOf(base64.charAt(i)) >>> (6 - imod4 * 2)));
+                }
 
-                window.reactor = new Reactor();
-            })();
-        }
+                return bytes;
+            }
 
-        /* Sample Usage
-          --Creating and defining the event--
-          reactor.registerEvent('<eventName>');
-          reactor.addEventListener('<eventName>', function(someObject){
-            do something...
-          });
-          --Firing the event--
-          reactor.dispatchEvent('<eventName>',<someObject>);
-        */
+        };
 
+        // Crypto character encodings
+        var charenc = Crypto.charenc = {};
 
-        /*!
-        * Crypto-JS v2.5.4  Crypto.js
-        * http://code.google.com/p/crypto-js/
-        * Copyright (c) 2009-2013, Jeff Mott. All rights reserved.
-        * http://code.google.com/p/crypto-js/wiki/License
-        */
-        if (typeof Crypto == "undefined" || !Crypto.util) {
-            (function () {
+        // UTF-8 encoding
+        var UTF8 = charenc.UTF8 = {
 
-                var base64map = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+            // Convert a string to a byte array
+            stringToBytes: function (str) {
+                return Binary.stringToBytes(unescape(encodeURIComponent(str)));
+            },
 
-                // Global Crypto object
-                var Crypto = window.Crypto = {};
+            // Convert a byte array to a string
+            bytesToString: function (bytes) {
+                return decodeURIComponent(escape(Binary.bytesToString(bytes)));
+            }
 
-                // Crypto utilities
-                var util = Crypto.util = {
+        };
 
-                    // Bit-wise rotate left
-                    rotl: function (n, b) {
-                        return (n << b) | (n >>> (32 - b));
-                    },
+        // Binary encoding
+        var Binary = charenc.Binary = {
 
-                    // Bit-wise rotate right
-                    rotr: function (n, b) {
-                        return (n << (32 - b)) | (n >>> b);
-                    },
+            // Convert a string to a byte array
+            stringToBytes: function (str) {
+                for (var bytes = [], i = 0; i < str.length; i++)
+                    bytes.push(str.charCodeAt(i) & 0xFF);
+                return bytes;
+            },
 
-                    // Swap big-endian to little-endian and vice versa
-                    endian: function (n) {
+            // Convert a byte array to a string
+            bytesToString: function (bytes) {
+                for (var str = [], i = 0; i < bytes.length; i++)
+                    str.push(String.fromCharCode(bytes[i]));
+                return str.join("");
+            }
 
-                        // If number given, swap endian
-                        if (n.constructor == Number) {
-                            return util.rotl(n, 8) & 0x00FF00FF |
-                                util.rotl(n, 24) & 0xFF00FF00;
-                        }
+        };
 
-                        // Else, assume array and swap all items
-                        for (var i = 0; i < n.length; i++)
-                            n[i] = util.endian(n[i]);
-                        return n;
-
-                    },
-
-                    // Generate an array of any length of random bytes
-                    randomBytes: function (n) {
-                        for (var bytes = []; n > 0; n--)
-                            bytes.push(Math.floor(Math.random() * 256));
-                        return bytes;
-                    },
-
-                    // Convert a byte array to big-endian 32-bit words
-                    bytesToWords: function (bytes) {
-                        for (var words = [], i = 0, b = 0; i < bytes.length; i++, b += 8)
-                            words[b >>> 5] |= (bytes[i] & 0xFF) << (24 - b % 32);
-                        return words;
-                    },
-
-                    // Convert big-endian 32-bit words to a byte array
-                    wordsToBytes: function (words) {
-                        for (var bytes = [], b = 0; b < words.length * 32; b += 8)
-                            bytes.push((words[b >>> 5] >>> (24 - b % 32)) & 0xFF);
-                        return bytes;
-                    },
-
-                    // Convert a byte array to a hex string
-                    bytesToHex: function (bytes) {
-                        for (var hex = [], i = 0; i < bytes.length; i++) {
-                            hex.push((bytes[i] >>> 4).toString(16));
-                            hex.push((bytes[i] & 0xF).toString(16));
-                        }
-                        return hex.join("");
-                    },
-
-                    // Convert a hex string to a byte array
-                    hexToBytes: function (hex) {
-                        for (var bytes = [], c = 0; c < hex.length; c += 2)
-                            bytes.push(parseInt(hex.substr(c, 2), 16));
-                        return bytes;
-                    },
-
-                    // Convert a byte array to a base-64 string
-                    bytesToBase64: function (bytes) {
-                        for (var base64 = [], i = 0; i < bytes.length; i += 3) {
-                            var triplet = (bytes[i] << 16) | (bytes[i + 1] << 8) | bytes[i + 2];
-                            for (var j = 0; j < 4; j++) {
-                                if (i * 8 + j * 6 <= bytes.length * 8)
-                                    base64.push(base64map.charAt((triplet >>> 6 * (3 - j)) & 0x3F));
-                                else base64.push("=");
-                            }
-                        }
-
-                        return base64.join("");
-                    },
-
-                    // Convert a base-64 string to a byte array
-                    base64ToBytes: function (base64) {
-                        // Remove non-base-64 characters
-                        base64 = base64.replace(/[^A-Z0-9+\/]/ig, "");
-
-                        for (var bytes = [], i = 0, imod4 = 0; i < base64.length; imod4 = ++i % 4) {
-                            if (imod4 == 0) continue;
-                            bytes.push(((base64map.indexOf(base64.charAt(i - 1)) & (Math.pow(2, -2 * imod4 + 8) - 1)) << (imod4 * 2)) |
-                                (base64map.indexOf(base64.charAt(i)) >>> (6 - imod4 * 2)));
-                        }
-
-                        return bytes;
-                    }
-
-                };
-
-                // Crypto character encodings
-                var charenc = Crypto.charenc = {};
-
-                // UTF-8 encoding
-                var UTF8 = charenc.UTF8 = {
-
-                    // Convert a string to a byte array
-                    stringToBytes: function (str) {
-                        return Binary.stringToBytes(unescape(encodeURIComponent(str)));
-                    },
-
-                    // Convert a byte array to a string
-                    bytesToString: function (bytes) {
-                        return decodeURIComponent(escape(Binary.bytesToString(bytes)));
-                    }
-
-                };
-
-                // Binary encoding
-                var Binary = charenc.Binary = {
-
-                    // Convert a string to a byte array
-                    stringToBytes: function (str) {
-                        for (var bytes = [], i = 0; i < str.length; i++)
-                            bytes.push(str.charCodeAt(i) & 0xFF);
-                        return bytes;
-                    },
-
-                    // Convert a byte array to a string
-                    bytesToString: function (bytes) {
-                        for (var str = [], i = 0; i < bytes.length; i++)
-                            str.push(String.fromCharCode(bytes[i]));
-                        return str.join("");
-                    }
-
-                };
-
-            })();
-        }
+    })();
+}
 
 
 
@@ -408,7 +413,7 @@
                 var digestbytes = util.wordsToBytes(SHA1._sha1(message));
                 return options && options.asBytes ? digestbytes :
                     options && options.asString ? Binary.bytesToString(digestbytes) :
-                        util.bytesToHex(digestbytes);
+                    util.bytesToHex(digestbytes);
             };
 
             // The core
@@ -449,9 +454,9 @@
 
                         var t = ((H0 << 5) | (H0 >>> 27)) + H4 + (w[j] >>> 0) + (
                             j < 20 ? (H1 & H2 | ~H1 & H3) + 1518500249 :
-                                j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 :
-                                    j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 :
-                                        (H1 ^ H2 ^ H3) - 899497514);
+                            j < 40 ? (H1 ^ H2 ^ H3) + 1859775393 :
+                            j < 60 ? (H1 & H2 | H1 & H3 | H2 & H3) - 1894007588 :
+                            (H1 ^ H2 ^ H3) - 899497514);
 
                         H4 = H3;
                         H3 = H2;
@@ -525,7 +530,7 @@
 
                 return options && options.asBytes ? hmacbytes :
                     options && options.asString ? Binary.bytesToString(hmacbytes) :
-                        util.bytesToHex(hmacbytes);
+                    util.bytesToHex(hmacbytes);
 
             };
 
@@ -598,8 +603,8 @@
                         for (var b = b.replace(/[^A-Z0-9+\/]/ig, ""), a = [], c = 0, e = 0; c < b.length; e = ++c %
                             4) e != 0 && a.push(("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"
                                 .indexOf(b.charAt(c - 1)) & Math.pow(2, -2 * e + 8) - 1) << e * 2 |
-                                "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(b.charAt(
-                                    c)) >>> 6 - e * 2);
+                            "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".indexOf(b.charAt(
+                                c)) >>> 6 - e * 2);
                         return a
                     }
                 },
@@ -666,7 +671,7 @@
                     for (h = 0; h < 64; h++) {
                         h < 16 ? d[h] = e[h + t] : (l = d[h - 15], j = d[h - 2], d[h] = ((l << 25 | l >>> 7) ^
                             (l << 14 | l >>> 18) ^ l >>> 3) + (d[h - 7] >>> 0) + ((j << 15 | j >>> 17) ^
-                                (j << 13 | j >>> 19) ^ j >>> 10) + (d[h - 16] >>> 0));
+                            (j << 13 | j >>> 19) ^ j >>> 10) + (d[h - 16] >>> 0));
                         j = f & g ^ f & m ^ g & m;
                         var u = (f << 30 | f >>> 2) ^ (f << 19 | f >>> 13) ^ (f << 10 | f >>> 22);
                         l = (s >>> 0) + ((i << 26 | i >>> 6) ^ (i << 21 | i >>> 11) ^ (i << 7 | i >>> 25)) +
@@ -719,192 +724,192 @@
         })();
 
 
-        /*!
-        * Random number generator with ArcFour PRNG
-        *
-        * NOTE: For best results, put code like
-        * <body onclick='SecureRandom.seedTime();' onkeypress='SecureRandom.seedTime();'>
-        * in your main HTML document.
-        *
-        * Copyright Tom Wu, bitaddress.org  BSD License.
-        * http://www-cs-students.stanford.edu/~tjw/jsbn/LICENSE
-        */
-        (function () {
+/*!
+* Random number generator with ArcFour PRNG
+*
+* NOTE: For best results, put code like
+* <body onclick='SecureRandom.seedTime();' onkeypress='SecureRandom.seedTime();'>
+* in your main HTML document.
+*
+* Copyright Tom Wu, bitaddress.org  BSD License.
+* http://www-cs-students.stanford.edu/~tjw/jsbn/LICENSE
+*/
+(function () {
 
-            // Constructor function of Global SecureRandom object
-            var sr = window.SecureRandom = function () { };
+    // Constructor function of Global SecureRandom object
+    var sr = window.SecureRandom = function () { };
 
-            // Properties
-            sr.state;
-            sr.pool;
-            sr.pptr;
-            sr.poolCopyOnInit;
+    // Properties
+    sr.state;
+    sr.pool;
+    sr.pptr;
+    sr.poolCopyOnInit;
 
-            // Pool size must be a multiple of 4 and greater than 32.
-            // An array of bytes the size of the pool will be passed to init()
-            sr.poolSize = 256;
+    // Pool size must be a multiple of 4 and greater than 32.
+    // An array of bytes the size of the pool will be passed to init()
+    sr.poolSize = 256;
 
-            // --- object methods ---
+    // --- object methods ---
 
-            // public method
-            // ba: byte array
-            sr.prototype.nextBytes = function (ba) {
-                var i;
-                if (window.crypto && window.crypto.getRandomValues && window.Uint8Array) {
-                    try {
-                        var rvBytes = new Uint8Array(ba.length);
-                        window.crypto.getRandomValues(rvBytes);
-                        for (i = 0; i < ba.length; ++i)
-                            ba[i] = sr.getByte() ^ rvBytes[i];
-                        return;
-                    } catch (e) {
-                        alert(e);
-                    }
-                }
-                for (i = 0; i < ba.length; ++i) ba[i] = sr.getByte();
-            };
-
-
-            // --- static methods ---
-
-            // Mix in the current time (w/milliseconds) into the pool
-            // NOTE: this method should be called from body click/keypress event handlers to increase entropy
-            sr.seedTime = function () {
-                sr.seedInt(new Date().getTime());
+    // public method
+    // ba: byte array
+    sr.prototype.nextBytes = function (ba) {
+        var i;
+        if (window.crypto && window.crypto.getRandomValues && window.Uint8Array) {
+            try {
+                var rvBytes = new Uint8Array(ba.length);
+                window.crypto.getRandomValues(rvBytes);
+                for (i = 0; i < ba.length; ++i)
+                    ba[i] = sr.getByte() ^ rvBytes[i];
+                return;
+            } catch (e) {
+                alert(e);
             }
+        }
+        for (i = 0; i < ba.length; ++i) ba[i] = sr.getByte();
+    };
 
-            sr.getByte = function () {
-                if (sr.state == null) {
-                    sr.seedTime();
-                    sr.state = sr.ArcFour(); // Plug in your RNG constructor here
-                    sr.state.init(sr.pool);
-                    sr.poolCopyOnInit = [];
-                    for (sr.pptr = 0; sr.pptr < sr.pool.length; ++sr.pptr)
-                        sr.poolCopyOnInit[sr.pptr] = sr.pool[sr.pptr];
-                    sr.pptr = 0;
-                }
-                // TODO: allow reseeding after first request
-                return sr.state.next();
+
+    // --- static methods ---
+
+    // Mix in the current time (w/milliseconds) into the pool
+    // NOTE: this method should be called from body click/keypress event handlers to increase entropy
+    sr.seedTime = function () {
+        sr.seedInt(new Date().getTime());
+    }
+
+    sr.getByte = function () {
+        if (sr.state == null) {
+            sr.seedTime();
+            sr.state = sr.ArcFour(); // Plug in your RNG constructor here
+            sr.state.init(sr.pool);
+            sr.poolCopyOnInit = [];
+            for (sr.pptr = 0; sr.pptr < sr.pool.length; ++sr.pptr)
+                sr.poolCopyOnInit[sr.pptr] = sr.pool[sr.pptr];
+            sr.pptr = 0;
+        }
+        // TODO: allow reseeding after first request
+        return sr.state.next();
+    }
+
+    // Mix in a 32-bit integer into the pool
+    sr.seedInt = function (x) {
+        sr.seedInt8(x);
+        sr.seedInt8((x >> 8));
+        sr.seedInt8((x >> 16));
+        sr.seedInt8((x >> 24));
+    }
+
+    // Mix in a 16-bit integer into the pool
+    sr.seedInt16 = function (x) {
+        sr.seedInt8(x);
+        sr.seedInt8((x >> 8));
+    }
+
+    // Mix in a 8-bit integer into the pool
+    sr.seedInt8 = function (x) {
+        sr.pool[sr.pptr++] ^= x & 255;
+        if (sr.pptr >= sr.poolSize) sr.pptr -= sr.poolSize;
+    }
+
+    // Arcfour is a PRNG
+    sr.ArcFour = function () {
+        function Arcfour() {
+            this.i = 0;
+            this.j = 0;
+            this.S = new Array();
+        }
+
+        // Initialize arcfour context from key, an array of ints, each from [0..255]
+        function ARC4init(key) {
+            var i, j, t;
+            for (i = 0; i < 256; ++i)
+                this.S[i] = i;
+            j = 0;
+            for (i = 0; i < 256; ++i) {
+                j = (j + this.S[i] + key[i % key.length]) & 255;
+                t = this.S[i];
+                this.S[i] = this.S[j];
+                this.S[j] = t;
             }
+            this.i = 0;
+            this.j = 0;
+        }
 
-            // Mix in a 32-bit integer into the pool
-            sr.seedInt = function (x) {
-                sr.seedInt8(x);
-                sr.seedInt8((x >> 8));
-                sr.seedInt8((x >> 16));
-                sr.seedInt8((x >> 24));
-            }
+        function ARC4next() {
+            var t;
+            this.i = (this.i + 1) & 255;
+            this.j = (this.j + this.S[this.i]) & 255;
+            t = this.S[this.i];
+            this.S[this.i] = this.S[this.j];
+            this.S[this.j] = t;
+            return this.S[(t + this.S[this.i]) & 255];
+        }
 
-            // Mix in a 16-bit integer into the pool
-            sr.seedInt16 = function (x) {
-                sr.seedInt8(x);
-                sr.seedInt8((x >> 8));
-            }
+        Arcfour.prototype.init = ARC4init;
+        Arcfour.prototype.next = ARC4next;
 
-            // Mix in a 8-bit integer into the pool
-            sr.seedInt8 = function (x) {
-                sr.pool[sr.pptr++] ^= x & 255;
-                if (sr.pptr >= sr.poolSize) sr.pptr -= sr.poolSize;
-            }
-
-            // Arcfour is a PRNG
-            sr.ArcFour = function () {
-                function Arcfour() {
-                    this.i = 0;
-                    this.j = 0;
-                    this.S = new Array();
-                }
-
-                // Initialize arcfour context from key, an array of ints, each from [0..255]
-                function ARC4init(key) {
-                    var i, j, t;
-                    for (i = 0; i < 256; ++i)
-                        this.S[i] = i;
-                    j = 0;
-                    for (i = 0; i < 256; ++i) {
-                        j = (j + this.S[i] + key[i % key.length]) & 255;
-                        t = this.S[i];
-                        this.S[i] = this.S[j];
-                        this.S[j] = t;
-                    }
-                    this.i = 0;
-                    this.j = 0;
-                }
-
-                function ARC4next() {
-                    var t;
-                    this.i = (this.i + 1) & 255;
-                    this.j = (this.j + this.S[this.i]) & 255;
-                    t = this.S[this.i];
-                    this.S[this.i] = this.S[this.j];
-                    this.S[this.j] = t;
-                    return this.S[(t + this.S[this.i]) & 255];
-                }
-
-                Arcfour.prototype.init = ARC4init;
-                Arcfour.prototype.next = ARC4next;
-
-                return new Arcfour();
-            };
+        return new Arcfour();
+    };
 
 
-            // Initialize the pool with junk if needed.
-            if (sr.pool == null) {
-                sr.pool = new Array();
-                sr.pptr = 0;
-                var t;
-                if (window.crypto && window.crypto.getRandomValues && window.Uint8Array) {
-                    try {
-                        // Use webcrypto if available
-                        var ua = new Uint8Array(sr.poolSize);
-                        window.crypto.getRandomValues(ua);
-                        for (t = 0; t < sr.poolSize; ++t)
-                            sr.pool[sr.pptr++] = ua[t];
-                    } catch (e) { alert(e); }
-                }
-                while (sr.pptr < sr.poolSize) {  // extract some randomness from Math.random()
-                    t = Math.floor(65536 * Math.random());
-                    sr.pool[sr.pptr++] = t >>> 8;
-                    sr.pool[sr.pptr++] = t & 255;
-                }
-                sr.pptr = Math.floor(sr.poolSize * Math.random());
-                sr.seedTime();
-                // entropy
-                var entropyStr = "";
-                // screen size and color depth: ~4.8 to ~5.4 bits
-                entropyStr += (window.screen.height * window.screen.width * window.screen.colorDepth);
-                entropyStr += (window.screen.availHeight * window.screen.availWidth * window.screen.pixelDepth);
-                // time zone offset: ~4 bits
-                var dateObj = new Date();
-                var timeZoneOffset = dateObj.getTimezoneOffset();
-                entropyStr += timeZoneOffset;
-                // user agent: ~8.3 to ~11.6 bits
-                entropyStr += navigator.userAgent;
-                // browser plugin details: ~16.2 to ~21.8 bits
-                var pluginsStr = "";
-                for (var i = 0; i < navigator.plugins.length; i++) {
-                    pluginsStr += navigator.plugins[i].name + " " + navigator.plugins[i].filename + " " + navigator.plugins[i].description + " " + navigator.plugins[i].version + ", ";
-                }
-                var mimeTypesStr = "";
-                for (var i = 0; i < navigator.mimeTypes.length; i++) {
-                    mimeTypesStr += navigator.mimeTypes[i].description + " " + navigator.mimeTypes[i].type + " " + navigator.mimeTypes[i].suffixes + ", ";
-                }
-                entropyStr += pluginsStr + mimeTypesStr;
-                // cookies and storage: 1 bit
-                entropyStr += navigator.cookieEnabled + typeof (sessionStorage) + typeof (localStorage);
-                // language: ~7 bit
-                entropyStr += navigator.language;
-                // history: ~2 bit
-                entropyStr += window.history.length;
-                // location
-                entropyStr += window.location;
+    // Initialize the pool with junk if needed.
+    if (sr.pool == null) {
+        sr.pool = new Array();
+        sr.pptr = 0;
+        var t;
+        if (window.crypto && window.crypto.getRandomValues && window.Uint8Array) {
+            try {
+                // Use webcrypto if available
+                var ua = new Uint8Array(sr.poolSize);
+                window.crypto.getRandomValues(ua);
+                for (t = 0; t < sr.poolSize; ++t)
+                    sr.pool[sr.pptr++] = ua[t];
+            } catch (e) { alert(e); }
+        }
+        while (sr.pptr < sr.poolSize) {  // extract some randomness from Math.random()
+            t = Math.floor(65536 * Math.random());
+            sr.pool[sr.pptr++] = t >>> 8;
+            sr.pool[sr.pptr++] = t & 255;
+        }
+        sr.pptr = Math.floor(sr.poolSize * Math.random());
+        sr.seedTime();
+        // entropy
+        var entropyStr = "";
+        // screen size and color depth: ~4.8 to ~5.4 bits
+        entropyStr += (window.screen.height * window.screen.width * window.screen.colorDepth);
+        entropyStr += (window.screen.availHeight * window.screen.availWidth * window.screen.pixelDepth);
+        // time zone offset: ~4 bits
+        var dateObj = new Date();
+        var timeZoneOffset = dateObj.getTimezoneOffset();
+        entropyStr += timeZoneOffset;
+        // user agent: ~8.3 to ~11.6 bits
+        entropyStr += navigator.userAgent;
+        // browser plugin details: ~16.2 to ~21.8 bits
+        var pluginsStr = "";
+        for (var i = 0; i < navigator.plugins.length; i++) {
+            pluginsStr += navigator.plugins[i].name + " " + navigator.plugins[i].filename + " " + navigator.plugins[i].description + " " + navigator.plugins[i].version + ", ";
+        }
+        var mimeTypesStr = "";
+        for (var i = 0; i < navigator.mimeTypes.length; i++) {
+            mimeTypesStr += navigator.mimeTypes[i].description + " " + navigator.mimeTypes[i].type + " " + navigator.mimeTypes[i].suffixes + ", ";
+        }
+        entropyStr += pluginsStr + mimeTypesStr;
+        // cookies and storage: 1 bit
+        entropyStr += navigator.cookieEnabled + typeof (sessionStorage) + typeof (localStorage);
+        // language: ~7 bit
+        entropyStr += navigator.language;
+        // history: ~2 bit
+        entropyStr += window.history.length;
+        // location
+        entropyStr += window.location;
 
-                var entropyBytes = Crypto.SHA256(entropyStr, { asBytes: true });
-                for (var i = 0; i < entropyBytes.length; i++) {
-                    sr.seedInt8(entropyBytes[i]);
-                }
-            }
-        })();
+        var entropyBytes = Crypto.SHA256(entropyStr, { asBytes: true });
+        for (var i = 0 ; i < entropyBytes.length ; i++) {
+            sr.seedInt8(entropyBytes[i]);
+        }
+    }
+})();
 
 
         //ripemd160.js
@@ -1136,7 +1141,7 @@
                 if (a != null)
                     if ("number" == typeof a) this.fromNumber(a, b, c);
                     else if (b == null && "string" != typeof a) this.fromString(a, 256);
-                    else this.fromString(a, b);
+                else this.fromString(a, b);
             };
 
             // Bits per digit
@@ -2602,7 +2607,7 @@
 
 
             // A "null" reducer
-            var NullExp = window.NullExp = function NullExp() { }
+            var NullExp = window.NullExp = function NullExp() {}
             NullExp.prototype.convert = function (x) {
                 return x;
             };
@@ -2693,7 +2698,7 @@
         (function () {
 
             // Constructor function of Global EllipticCurve object
-            var ec = window.EllipticCurve = function () { };
+            var ec  = window.EllipticCurve = function () {};
 
             // ----------------
             // ECFieldElementFp constructor
@@ -2779,7 +2784,7 @@
                         P = new BigInteger(this.q.bitLength(), rand);
                     }
                     while (P.compareTo(this.q) >= 0 || !(P.multiply(P).subtract(fourQ).modPow(legendreExponent,
-                        this.q).equals(qMinusOne)));
+                            this.q).equals(qMinusOne)));
 
                     var result = ec.FieldElementFp.fastLucasSequence(this.q, P, Q, k);
 
@@ -2798,419 +2803,419 @@
 
                 return null;
             };
-            /*!
-    * Crypto-JS 2.5.4 BlockModes.js
-    * contribution from Simon Greatrix
-    */
+                /*!
+        * Crypto-JS 2.5.4 BlockModes.js
+        * contribution from Simon Greatrix
+        */
 
-            (function (C) {
+        (function (C) {
 
-                // Create pad namespace
-                var C_pad = C.pad = {};
+            // Create pad namespace
+            var C_pad = C.pad = {};
 
-                // Calculate the number of padding bytes required.
-                function _requiredPadding(cipher, message) {
-                    var blockSizeInBytes = cipher._blocksize * 4;
-                    var reqd = blockSizeInBytes - message.length % blockSizeInBytes;
-                    return reqd;
+            // Calculate the number of padding bytes required.
+            function _requiredPadding(cipher, message) {
+                var blockSizeInBytes = cipher._blocksize * 4;
+                var reqd = blockSizeInBytes - message.length % blockSizeInBytes;
+                return reqd;
+            }
+
+            // Remove padding when the final byte gives the number of padding bytes.
+            var _unpadLength = function (cipher, message, alg, padding) {
+                var pad = message.pop();
+                if (pad == 0) {
+                    throw new Error("Invalid zero-length padding specified for " + alg +
+                        ". Wrong cipher specification or key used?");
                 }
-
-                // Remove padding when the final byte gives the number of padding bytes.
-                var _unpadLength = function (cipher, message, alg, padding) {
-                    var pad = message.pop();
-                    if (pad == 0) {
-                        throw new Error("Invalid zero-length padding specified for " + alg +
-                            ". Wrong cipher specification or key used?");
-                    }
-                    var maxPad = cipher._blocksize * 4;
-                    if (pad > maxPad) {
-                        throw new Error("Invalid padding length of " + pad +
+                var maxPad = cipher._blocksize * 4;
+                if (pad > maxPad) {
+                    throw new Error("Invalid padding length of " + pad +
+                        " specified for " + alg +
+                        ". Wrong cipher specification or key used?");
+                }
+                for (var i = 1; i < pad; i++) {
+                    var b = message.pop();
+                    if (padding != undefined && padding != b) {
+                        throw new Error("Invalid padding byte of 0x" + b.toString(16) +
                             " specified for " + alg +
                             ". Wrong cipher specification or key used?");
                     }
-                    for (var i = 1; i < pad; i++) {
+                }
+            };
+
+            // No-operation padding, used for stream ciphers
+            C_pad.NoPadding = {
+                pad: function (cipher, message) {},
+                unpad: function (cipher, message) {}
+            };
+
+            // Zero Padding.
+            //
+            // If the message is not an exact number of blocks, the final block is
+            // completed with 0x00 bytes. There is no unpadding.
+            C_pad.ZeroPadding = {
+                pad: function (cipher, message) {
+                    var blockSizeInBytes = cipher._blocksize * 4;
+                    var reqd = message.length % blockSizeInBytes;
+                    if (reqd != 0) {
+                        for (reqd = blockSizeInBytes - reqd; reqd > 0; reqd--) {
+                            message.push(0x00);
+                        }
+                    }
+                },
+
+                unpad: function (cipher, message) {
+                    while (message[message.length - 1] == 0) {
+                        message.pop();
+                    }
+                }
+            };
+
+            // ISO/IEC 7816-4 padding.
+            //
+            // Pads the plain text with an 0x80 byte followed by as many 0x00
+            // bytes are required to complete the block.
+            C_pad.iso7816 = {
+                pad: function (cipher, message) {
+                    var reqd = _requiredPadding(cipher, message);
+                    message.push(0x80);
+                    for (; reqd > 1; reqd--) {
+                        message.push(0x00);
+                    }
+                },
+
+                unpad: function (cipher, message) {
+                    var padLength;
+                    for (padLength = cipher._blocksize * 4; padLength > 0; padLength--) {
                         var b = message.pop();
-                        if (padding != undefined && padding != b) {
-                            throw new Error("Invalid padding byte of 0x" + b.toString(16) +
-                                " specified for " + alg +
+                        if (b == 0x80) return;
+                        if (b != 0x00) {
+                            throw new Error("ISO-7816 padding byte must be 0, not 0x" + b.toString(16) +
                                 ". Wrong cipher specification or key used?");
                         }
                     }
-                };
+                    throw new Error(
+                        "ISO-7816 padded beyond cipher block size. Wrong cipher specification or key used?"
+                    );
+                }
+            };
 
-                // No-operation padding, used for stream ciphers
-                C_pad.NoPadding = {
-                    pad: function (cipher, message) { },
-                    unpad: function (cipher, message) { }
-                };
-
-                // Zero Padding.
-                //
-                // If the message is not an exact number of blocks, the final block is
-                // completed with 0x00 bytes. There is no unpadding.
-                C_pad.ZeroPadding = {
-                    pad: function (cipher, message) {
-                        var blockSizeInBytes = cipher._blocksize * 4;
-                        var reqd = message.length % blockSizeInBytes;
-                        if (reqd != 0) {
-                            for (reqd = blockSizeInBytes - reqd; reqd > 0; reqd--) {
-                                message.push(0x00);
-                            }
-                        }
-                    },
-
-                    unpad: function (cipher, message) {
-                        while (message[message.length - 1] == 0) {
-                            message.pop();
-                        }
+            // ANSI X.923 padding
+            //
+            // The final block is padded with zeros except for the last byte of the
+            // last block which contains the number of padding bytes.
+            C_pad.ansix923 = {
+                pad: function (cipher, message) {
+                    var reqd = _requiredPadding(cipher, message);
+                    for (var i = 1; i < reqd; i++) {
+                        message.push(0x00);
                     }
-                };
+                    message.push(reqd);
+                },
 
-                // ISO/IEC 7816-4 padding.
-                //
-                // Pads the plain text with an 0x80 byte followed by as many 0x00
-                // bytes are required to complete the block.
-                C_pad.iso7816 = {
-                    pad: function (cipher, message) {
-                        var reqd = _requiredPadding(cipher, message);
-                        message.push(0x80);
-                        for (; reqd > 1; reqd--) {
-                            message.push(0x00);
-                        }
-                    },
+                unpad: function (cipher, message) {
+                    _unpadLength(cipher, message, "ANSI X.923", 0);
+                }
+            };
 
-                    unpad: function (cipher, message) {
-                        var padLength;
-                        for (padLength = cipher._blocksize * 4; padLength > 0; padLength--) {
-                            var b = message.pop();
-                            if (b == 0x80) return;
-                            if (b != 0x00) {
-                                throw new Error("ISO-7816 padding byte must be 0, not 0x" + b.toString(16) +
-                                    ". Wrong cipher specification or key used?");
-                            }
-                        }
-                        throw new Error(
-                            "ISO-7816 padded beyond cipher block size. Wrong cipher specification or key used?"
-                        );
+            // ISO 10126
+            //
+            // The final block is padded with random bytes except for the last
+            // byte of the last block which contains the number of padding bytes.
+            C_pad.iso10126 = {
+                pad: function (cipher, message) {
+                    var reqd = _requiredPadding(cipher, message);
+                    for (var i = 1; i < reqd; i++) {
+                        message.push(Math.floor(Math.random() * 256));
                     }
-                };
+                    message.push(reqd);
+                },
 
-                // ANSI X.923 padding
-                //
-                // The final block is padded with zeros except for the last byte of the
-                // last block which contains the number of padding bytes.
-                C_pad.ansix923 = {
-                    pad: function (cipher, message) {
-                        var reqd = _requiredPadding(cipher, message);
-                        for (var i = 1; i < reqd; i++) {
-                            message.push(0x00);
-                        }
+                unpad: function (cipher, message) {
+                    _unpadLength(cipher, message, "ISO 10126", undefined);
+                }
+            };
+
+            // PKCS7 padding
+            //
+            // PKCS7 is described in RFC 5652. Padding is in whole bytes. The
+            // value of each added byte is the number of bytes that are added,
+            // i.e. N bytes, each of value N are added.
+            C_pad.pkcs7 = {
+                pad: function (cipher, message) {
+                    var reqd = _requiredPadding(cipher, message);
+                    for (var i = 0; i < reqd; i++) {
                         message.push(reqd);
-                    },
-
-                    unpad: function (cipher, message) {
-                        _unpadLength(cipher, message, "ANSI X.923", 0);
                     }
-                };
+                },
 
-                // ISO 10126
-                //
-                // The final block is padded with random bytes except for the last
-                // byte of the last block which contains the number of padding bytes.
-                C_pad.iso10126 = {
-                    pad: function (cipher, message) {
-                        var reqd = _requiredPadding(cipher, message);
-                        for (var i = 1; i < reqd; i++) {
-                            message.push(Math.floor(Math.random() * 256));
-                        }
-                        message.push(reqd);
-                    },
+                unpad: function (cipher, message) {
+                    _unpadLength(cipher, message, "PKCS 7", message[message.length - 1]);
+                }
+            };
 
-                    unpad: function (cipher, message) {
-                        _unpadLength(cipher, message, "ISO 10126", undefined);
+            // Create mode namespace
+            var C_mode = C.mode = {};
+
+            /**
+            * Mode base "class".
+            */
+            var Mode = C_mode.Mode = function (padding) {
+                if (padding) {
+                    this._padding = padding;
+                }
+            };
+
+            Mode.prototype = {
+                encrypt: function (cipher, m, iv) {
+                    this._padding.pad(cipher, m);
+                    this._doEncrypt(cipher, m, iv);
+                },
+
+                decrypt: function (cipher, m, iv) {
+                    this._doDecrypt(cipher, m, iv);
+                    this._padding.unpad(cipher, m);
+                },
+
+                // Default padding
+                _padding: C_pad.iso7816
+            };
+
+
+            /**
+            * Electronic Code Book mode.
+            * 
+            * ECB applies the cipher directly against each block of the input.
+            * 
+            * ECB does not require an initialization vector.
+            */
+            var ECB = C_mode.ECB = function () {
+                // Call parent constructor
+                Mode.apply(this, arguments);
+            };
+
+            // Inherit from Mode
+            var ECB_prototype = ECB.prototype = new Mode;
+
+            // Concrete steps for Mode template
+            ECB_prototype._doEncrypt = function (cipher, m, iv) {
+                var blockSizeInBytes = cipher._blocksize * 4;
+                // Encrypt each block
+                for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
+                    cipher._encryptblock(m, offset);
+                }
+            };
+            ECB_prototype._doDecrypt = function (cipher, c, iv) {
+                var blockSizeInBytes = cipher._blocksize * 4;
+                // Decrypt each block
+                for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
+                    cipher._decryptblock(c, offset);
+                }
+            };
+
+            // ECB never uses an IV
+            ECB_prototype.fixOptions = function (options) {
+                options.iv = [];
+            };
+
+
+            /**
+            * Cipher block chaining
+            * 
+            * The first block is XORed with the IV. Subsequent blocks are XOR with the
+            * previous cipher output.
+            */
+            var CBC = C_mode.CBC = function () {
+                // Call parent constructor
+                Mode.apply(this, arguments);
+            };
+
+            // Inherit from Mode
+            var CBC_prototype = CBC.prototype = new Mode;
+
+            // Concrete steps for Mode template
+            CBC_prototype._doEncrypt = function (cipher, m, iv) {
+                var blockSizeInBytes = cipher._blocksize * 4;
+
+                // Encrypt each block
+                for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
+                    if (offset == 0) {
+                        // XOR first block using IV
+                        for (var i = 0; i < blockSizeInBytes; i++)
+                            m[i] ^= iv[i];
+                    } else {
+                        // XOR this block using previous crypted block
+                        for (var i = 0; i < blockSizeInBytes; i++)
+                            m[offset + i] ^= m[offset + i - blockSizeInBytes];
                     }
-                };
+                    // Encrypt block
+                    cipher._encryptblock(m, offset);
+                }
+            };
+            CBC_prototype._doDecrypt = function (cipher, c, iv) {
+                var blockSizeInBytes = cipher._blocksize * 4;
 
-                // PKCS7 padding
-                //
-                // PKCS7 is described in RFC 5652. Padding is in whole bytes. The
-                // value of each added byte is the number of bytes that are added,
-                // i.e. N bytes, each of value N are added.
-                C_pad.pkcs7 = {
-                    pad: function (cipher, message) {
-                        var reqd = _requiredPadding(cipher, message);
-                        for (var i = 0; i < reqd; i++) {
-                            message.push(reqd);
-                        }
-                    },
+                // At the start, the previously crypted block is the IV
+                var prevCryptedBlock = iv;
 
-                    unpad: function (cipher, message) {
-                        _unpadLength(cipher, message, "PKCS 7", message[message.length - 1]);
+                // Decrypt each block
+                for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
+                    // Save this crypted block
+                    var thisCryptedBlock = c.slice(offset, offset + blockSizeInBytes);
+                    // Decrypt block
+                    cipher._decryptblock(c, offset);
+                    // XOR decrypted block using previous crypted block
+                    for (var i = 0; i < blockSizeInBytes; i++) {
+                        c[offset + i] ^= prevCryptedBlock[i];
                     }
-                };
-
-                // Create mode namespace
-                var C_mode = C.mode = {};
-
-                /**
-                * Mode base "class".
-                */
-                var Mode = C_mode.Mode = function (padding) {
-                    if (padding) {
-                        this._padding = padding;
-                    }
-                };
-
-                Mode.prototype = {
-                    encrypt: function (cipher, m, iv) {
-                        this._padding.pad(cipher, m);
-                        this._doEncrypt(cipher, m, iv);
-                    },
-
-                    decrypt: function (cipher, m, iv) {
-                        this._doDecrypt(cipher, m, iv);
-                        this._padding.unpad(cipher, m);
-                    },
-
-                    // Default padding
-                    _padding: C_pad.iso7816
-                };
+                    prevCryptedBlock = thisCryptedBlock;
+                }
+            };
 
 
-                /**
-                * Electronic Code Book mode.
-                * 
-                * ECB applies the cipher directly against each block of the input.
-                * 
-                * ECB does not require an initialization vector.
-                */
-                var ECB = C_mode.ECB = function () {
-                    // Call parent constructor
-                    Mode.apply(this, arguments);
-                };
+            /**
+            * Cipher feed back
+            * 
+            * The cipher output is XORed with the plain text to produce the cipher output,
+            * which is then fed back into the cipher to produce a bit pattern to XOR the
+            * next block with.
+            * 
+            * This is a stream cipher mode and does not require padding.
+            */
+            var CFB = C_mode.CFB = function () {
+                // Call parent constructor
+                Mode.apply(this, arguments);
+            };
 
-                // Inherit from Mode
-                var ECB_prototype = ECB.prototype = new Mode;
+            // Inherit from Mode
+            var CFB_prototype = CFB.prototype = new Mode;
 
-                // Concrete steps for Mode template
-                ECB_prototype._doEncrypt = function (cipher, m, iv) {
-                    var blockSizeInBytes = cipher._blocksize * 4;
-                    // Encrypt each block
-                    for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
-                        cipher._encryptblock(m, offset);
-                    }
-                };
-                ECB_prototype._doDecrypt = function (cipher, c, iv) {
-                    var blockSizeInBytes = cipher._blocksize * 4;
-                    // Decrypt each block
-                    for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
-                        cipher._decryptblock(c, offset);
-                    }
-                };
+            // Override padding
+            CFB_prototype._padding = C_pad.NoPadding;
 
-                // ECB never uses an IV
-                ECB_prototype.fixOptions = function (options) {
-                    options.iv = [];
-                };
+            // Concrete steps for Mode template
+            CFB_prototype._doEncrypt = function (cipher, m, iv) {
+                var blockSizeInBytes = cipher._blocksize * 4,
+                    keystream = iv.slice(0);
+
+                // Encrypt each byte
+                for (var i = 0; i < m.length; i++) {
+
+                    var j = i % blockSizeInBytes;
+                    if (j == 0) cipher._encryptblock(keystream, 0);
+
+                    m[i] ^= keystream[j];
+                    keystream[j] = m[i];
+                }
+            };
+            CFB_prototype._doDecrypt = function (cipher, c, iv) {
+                var blockSizeInBytes = cipher._blocksize * 4,
+                    keystream = iv.slice(0);
+
+                // Encrypt each byte
+                for (var i = 0; i < c.length; i++) {
+
+                    var j = i % blockSizeInBytes;
+                    if (j == 0) cipher._encryptblock(keystream, 0);
+
+                    var b = c[i];
+                    c[i] ^= keystream[j];
+                    keystream[j] = b;
+                }
+            };
 
 
-                /**
-                * Cipher block chaining
-                * 
-                * The first block is XORed with the IV. Subsequent blocks are XOR with the
-                * previous cipher output.
-                */
-                var CBC = C_mode.CBC = function () {
-                    // Call parent constructor
-                    Mode.apply(this, arguments);
-                };
+            /**
+            * Output feed back
+            * 
+            * The cipher repeatedly encrypts its own output. The output is XORed with the
+            * plain text to produce the cipher text.
+            * 
+            * This is a stream cipher mode and does not require padding.
+            */
+            var OFB = C_mode.OFB = function () {
+                // Call parent constructor
+                Mode.apply(this, arguments);
+            };
 
-                // Inherit from Mode
-                var CBC_prototype = CBC.prototype = new Mode;
+            // Inherit from Mode
+            var OFB_prototype = OFB.prototype = new Mode;
 
-                // Concrete steps for Mode template
-                CBC_prototype._doEncrypt = function (cipher, m, iv) {
-                    var blockSizeInBytes = cipher._blocksize * 4;
+            // Override padding
+            OFB_prototype._padding = C_pad.NoPadding;
 
-                    // Encrypt each block
-                    for (var offset = 0; offset < m.length; offset += blockSizeInBytes) {
-                        if (offset == 0) {
-                            // XOR first block using IV
-                            for (var i = 0; i < blockSizeInBytes; i++)
-                                m[i] ^= iv[i];
-                        } else {
-                            // XOR this block using previous crypted block
-                            for (var i = 0; i < blockSizeInBytes; i++)
-                                m[offset + i] ^= m[offset + i - blockSizeInBytes];
-                        }
-                        // Encrypt block
-                        cipher._encryptblock(m, offset);
-                    }
-                };
-                CBC_prototype._doDecrypt = function (cipher, c, iv) {
-                    var blockSizeInBytes = cipher._blocksize * 4;
+            // Concrete steps for Mode template
+            OFB_prototype._doEncrypt = function (cipher, m, iv) {
 
-                    // At the start, the previously crypted block is the IV
-                    var prevCryptedBlock = iv;
+                var blockSizeInBytes = cipher._blocksize * 4,
+                    keystream = iv.slice(0);
 
-                    // Decrypt each block
-                    for (var offset = 0; offset < c.length; offset += blockSizeInBytes) {
-                        // Save this crypted block
-                        var thisCryptedBlock = c.slice(offset, offset + blockSizeInBytes);
-                        // Decrypt block
-                        cipher._decryptblock(c, offset);
-                        // XOR decrypted block using previous crypted block
-                        for (var i = 0; i < blockSizeInBytes; i++) {
-                            c[offset + i] ^= prevCryptedBlock[i];
-                        }
-                        prevCryptedBlock = thisCryptedBlock;
-                    }
-                };
+                // Encrypt each byte
+                for (var i = 0; i < m.length; i++) {
 
-
-                /**
-                * Cipher feed back
-                * 
-                * The cipher output is XORed with the plain text to produce the cipher output,
-                * which is then fed back into the cipher to produce a bit pattern to XOR the
-                * next block with.
-                * 
-                * This is a stream cipher mode and does not require padding.
-                */
-                var CFB = C_mode.CFB = function () {
-                    // Call parent constructor
-                    Mode.apply(this, arguments);
-                };
-
-                // Inherit from Mode
-                var CFB_prototype = CFB.prototype = new Mode;
-
-                // Override padding
-                CFB_prototype._padding = C_pad.NoPadding;
-
-                // Concrete steps for Mode template
-                CFB_prototype._doEncrypt = function (cipher, m, iv) {
-                    var blockSizeInBytes = cipher._blocksize * 4,
-                        keystream = iv.slice(0);
-
-                    // Encrypt each byte
-                    for (var i = 0; i < m.length; i++) {
-
-                        var j = i % blockSizeInBytes;
-                        if (j == 0) cipher._encryptblock(keystream, 0);
-
-                        m[i] ^= keystream[j];
-                        keystream[j] = m[i];
-                    }
-                };
-                CFB_prototype._doDecrypt = function (cipher, c, iv) {
-                    var blockSizeInBytes = cipher._blocksize * 4,
-                        keystream = iv.slice(0);
-
-                    // Encrypt each byte
-                    for (var i = 0; i < c.length; i++) {
-
-                        var j = i % blockSizeInBytes;
-                        if (j == 0) cipher._encryptblock(keystream, 0);
-
-                        var b = c[i];
-                        c[i] ^= keystream[j];
-                        keystream[j] = b;
-                    }
-                };
-
-
-                /**
-                * Output feed back
-                * 
-                * The cipher repeatedly encrypts its own output. The output is XORed with the
-                * plain text to produce the cipher text.
-                * 
-                * This is a stream cipher mode and does not require padding.
-                */
-                var OFB = C_mode.OFB = function () {
-                    // Call parent constructor
-                    Mode.apply(this, arguments);
-                };
-
-                // Inherit from Mode
-                var OFB_prototype = OFB.prototype = new Mode;
-
-                // Override padding
-                OFB_prototype._padding = C_pad.NoPadding;
-
-                // Concrete steps for Mode template
-                OFB_prototype._doEncrypt = function (cipher, m, iv) {
-
-                    var blockSizeInBytes = cipher._blocksize * 4,
-                        keystream = iv.slice(0);
-
-                    // Encrypt each byte
-                    for (var i = 0; i < m.length; i++) {
-
-                        // Generate keystream
-                        if (i % blockSizeInBytes == 0)
-                            cipher._encryptblock(keystream, 0);
-
-                        // Encrypt byte
-                        m[i] ^= keystream[i % blockSizeInBytes];
-
-                    }
-                };
-                OFB_prototype._doDecrypt = OFB_prototype._doEncrypt;
-
-                /**
-                * Counter
-                * @author Gergely Risko
-                *
-                * After every block the last 4 bytes of the IV is increased by one
-                * with carry and that IV is used for the next block.
-                *
-                * This is a stream cipher mode and does not require padding.
-                */
-                var CTR = C_mode.CTR = function () {
-                    // Call parent constructor
-                    Mode.apply(this, arguments);
-                };
-
-                // Inherit from Mode
-                var CTR_prototype = CTR.prototype = new Mode;
-
-                // Override padding
-                CTR_prototype._padding = C_pad.NoPadding;
-
-                CTR_prototype._doEncrypt = function (cipher, m, iv) {
-                    var blockSizeInBytes = cipher._blocksize * 4;
-                    var counter = iv.slice(0);
-
-                    for (var i = 0; i < m.length;) {
-                        // do not lose iv
-                        var keystream = counter.slice(0);
-
-                        // Generate keystream for next block
+                    // Generate keystream
+                    if (i % blockSizeInBytes == 0)
                         cipher._encryptblock(keystream, 0);
 
-                        // XOR keystream with block
-                        for (var j = 0; i < m.length && j < blockSizeInBytes; j++, i++) {
-                            m[i] ^= keystream[j];
-                        }
+                    // Encrypt byte
+                    m[i] ^= keystream[i % blockSizeInBytes];
 
-                        // Increase counter
-                        if (++(counter[blockSizeInBytes - 1]) == 256) {
-                            counter[blockSizeInBytes - 1] = 0;
-                            if (++(counter[blockSizeInBytes - 2]) == 256) {
-                                counter[blockSizeInBytes - 2] = 0;
-                                if (++(counter[blockSizeInBytes - 3]) == 256) {
-                                    counter[blockSizeInBytes - 3] = 0;
-                                    ++(counter[blockSizeInBytes - 4]);
-                                }
+                }
+            };
+            OFB_prototype._doDecrypt = OFB_prototype._doEncrypt;
+
+            /**
+            * Counter
+            * @author Gergely Risko
+            *
+            * After every block the last 4 bytes of the IV is increased by one
+            * with carry and that IV is used for the next block.
+            *
+            * This is a stream cipher mode and does not require padding.
+            */
+            var CTR = C_mode.CTR = function () {
+                // Call parent constructor
+                Mode.apply(this, arguments);
+            };
+
+            // Inherit from Mode
+            var CTR_prototype = CTR.prototype = new Mode;
+
+            // Override padding
+            CTR_prototype._padding = C_pad.NoPadding;
+
+            CTR_prototype._doEncrypt = function (cipher, m, iv) {
+                var blockSizeInBytes = cipher._blocksize * 4;
+                var counter = iv.slice(0);
+
+                for (var i = 0; i < m.length;) {
+                    // do not lose iv
+                    var keystream = counter.slice(0);
+
+                    // Generate keystream for next block
+                    cipher._encryptblock(keystream, 0);
+
+                    // XOR keystream with block
+                    for (var j = 0; i < m.length && j < blockSizeInBytes; j++, i++) {
+                        m[i] ^= keystream[j];
+                    }
+
+                    // Increase counter
+                    if (++(counter[blockSizeInBytes - 1]) == 256) {
+                        counter[blockSizeInBytes - 1] = 0;
+                        if (++(counter[blockSizeInBytes - 2]) == 256) {
+                            counter[blockSizeInBytes - 2] = 0;
+                            if (++(counter[blockSizeInBytes - 3]) == 256) {
+                                counter[blockSizeInBytes - 3] = 0;
+                                ++(counter[blockSizeInBytes - 4]);
                             }
                         }
                     }
-                };
-                CTR_prototype._doDecrypt = CTR_prototype._doEncrypt;
+                }
+            };
+            CTR_prototype._doDecrypt = CTR_prototype._doEncrypt;
 
-            })(Crypto);
+        })(Crypto);
 
             /*!
         * Crypto-JS v2.5.4  PBKDF2.js
@@ -3218,675 +3223,640 @@
         * Copyright (c) 2009-2013, Jeff Mott. All rights reserved.
         * http://code.google.com/p/crypto-js/wiki/License
         */
-            (function () {
+        (function () {
 
-                // Shortcuts
-                var C = Crypto,
-                    util = C.util,
-                    charenc = C.charenc,
-                    UTF8 = charenc.UTF8,
-                    Binary = charenc.Binary;
+            // Shortcuts
+            var C = Crypto,
+                util = C.util,
+                charenc = C.charenc,
+                UTF8 = charenc.UTF8,
+                Binary = charenc.Binary;
 
-                C.PBKDF2 = function (password, salt, keylen, options) {
+            C.PBKDF2 = function (password, salt, keylen, options) {
 
-                    // Convert to byte arrays
-                    if (password.constructor == String) password = UTF8.stringToBytes(password);
-                    if (salt.constructor == String) salt = UTF8.stringToBytes(salt);
-                    /* else, assume byte arrays already */
+                // Convert to byte arrays
+                if (password.constructor == String) password = UTF8.stringToBytes(password);
+                if (salt.constructor == String) salt = UTF8.stringToBytes(salt);
+                /* else, assume byte arrays already */
 
-                    // Defaults
-                    var hasher = options && options.hasher || C.SHA1,
-                        iterations = options && options.iterations || 1;
+                // Defaults
+                var hasher = options && options.hasher || C.SHA1,
+                    iterations = options && options.iterations || 1;
 
-                    // Pseudo-random function
-                    function PRF(password, salt) {
-                        return C.HMAC(hasher, salt, password, {
-                            asBytes: true
-                        });
+                // Pseudo-random function
+                function PRF(password, salt) {
+                    return C.HMAC(hasher, salt, password, {
+                        asBytes: true
+                    });
+                }
+
+                // Generate key
+                var derivedKeyBytes = [],
+                    blockindex = 1;
+                while (derivedKeyBytes.length < keylen) {
+                    var block = PRF(password, salt.concat(util.wordsToBytes([blockindex])));
+                    for (var u = block, i = 1; i < iterations; i++) {
+                        u = PRF(password, u);
+                        for (var j = 0; j < block.length; j++) block[j] ^= u[j];
                     }
+                    derivedKeyBytes = derivedKeyBytes.concat(block);
+                    blockindex++;
+                }
 
-                    // Generate key
-                    var derivedKeyBytes = [],
-                        blockindex = 1;
-                    while (derivedKeyBytes.length < keylen) {
-                        var block = PRF(password, salt.concat(util.wordsToBytes([blockindex])));
-                        for (var u = block, i = 1; i < iterations; i++) {
-                            u = PRF(password, u);
-                            for (var j = 0; j < block.length; j++) block[j] ^= u[j];
-                        }
-                        derivedKeyBytes = derivedKeyBytes.concat(block);
-                        blockindex++;
-                    }
+                // Truncate excess bytes
+                derivedKeyBytes.length = keylen;
 
-                    // Truncate excess bytes
-                    derivedKeyBytes.length = keylen;
+                return options && options.asBytes ? derivedKeyBytes :
+                    options && options.asString ? Binary.bytesToString(derivedKeyBytes) :
+                    util.bytesToHex(derivedKeyBytes);
 
-                    return options && options.asBytes ? derivedKeyBytes :
-                        options && options.asString ? Binary.bytesToString(derivedKeyBytes) :
-                            util.bytesToHex(derivedKeyBytes);
+            };
 
+        })();
+    
+  /*
+        * Copyright (c) 2010-2011 Intalio Pte, All Rights Reserved
+        * 
+        * 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.
+        */
+        // https://github.com/cheongwy/node-scrypt-js
+        (function () {
+
+            var MAX_VALUE = 2147483647;
+            var workerUrl = null;
+
+            //function scrypt(byte[] passwd, byte[] salt, int N, int r, int p, int dkLen)
+            /*
+            * N = Cpu cost
+            * r = Memory cost
+            * p = parallelization cost
+            * 
+            */
+            window.Crypto_scrypt = function (passwd, salt, N, r, p, dkLen, callback) {
+                if (N == 0 || (N & (N - 1)) != 0) throw Error("N must be > 0 and a power of 2");
+
+                if (N > MAX_VALUE / 128 / r) throw Error("Parameter N is too large");
+                if (r > MAX_VALUE / 128 / p) throw Error("Parameter r is too large");
+
+                var PBKDF2_opts = {
+                    iterations: 1,
+                    hasher: Crypto.SHA256,
+                    asBytes: true
                 };
 
-            })();
+                var B = Crypto.PBKDF2(passwd, salt, p * 128 * r, PBKDF2_opts);
 
-            /*
-                  * Copyright (c) 2010-2011 Intalio Pte, All Rights Reserved
-                  * 
-                  * 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.
-                  */
-            // https://github.com/cheongwy/node-scrypt-js
-            (function () {
-
-                var MAX_VALUE = 2147483647;
-                var workerUrl = null;
-
-                //function scrypt(byte[] passwd, byte[] salt, int N, int r, int p, int dkLen)
-                /*
-                * N = Cpu cost
-                * r = Memory cost
-                * p = parallelization cost
-                * 
-                */
-                window.Crypto_scrypt = function (passwd, salt, N, r, p, dkLen, callback) {
-                    if (N == 0 || (N & (N - 1)) != 0) throw Error("N must be > 0 and a power of 2");
-
-                    if (N > MAX_VALUE / 128 / r) throw Error("Parameter N is too large");
-                    if (r > MAX_VALUE / 128 / p) throw Error("Parameter r is too large");
-
-                    var PBKDF2_opts = {
-                        iterations: 1,
-                        hasher: Crypto.SHA256,
-                        asBytes: true
-                    };
-
-                    var B = Crypto.PBKDF2(passwd, salt, p * 128 * r, PBKDF2_opts);
-
-                    try {
-                        var i = 0;
-                        var worksDone = 0;
-                        var makeWorker = function () {
-                            if (!workerUrl) {
-                                var code = '(' + scryptCore.toString() + ')()';
-                                var blob;
-                                try {
-                                    blob = new Blob([code], {
-                                        type: "text/javascript"
-                                    });
-                                } catch (e) {
-                                    window.BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder ||
-                                        window.MozBlobBuilder ||
-                                        window.MSBlobBuilder;
-                                    blob = new BlobBuilder();
-                                    blob.append(code);
-                                    blob = blob.getBlob("text/javascript");
-                                }
-                                workerUrl = URL.createObjectURL(blob);
+                try {
+                    var i = 0;
+                    var worksDone = 0;
+                    var makeWorker = function () {
+                        if (!workerUrl) {
+                            var code = '(' + scryptCore.toString() + ')()';
+                            var blob;
+                            try {
+                                blob = new Blob([code], {
+                                    type: "text/javascript"
+                                });
+                            } catch (e) {
+                                window.BlobBuilder = window.BlobBuilder || window.WebKitBlobBuilder ||
+                                    window.MozBlobBuilder ||
+                                    window.MSBlobBuilder;
+                                blob = new BlobBuilder();
+                                blob.append(code);
+                                blob = blob.getBlob("text/javascript");
                             }
-                            var worker = new Worker(workerUrl);
-                            worker.onmessage = function (event) {
-                                var Bi = event.data[0],
-                                    Bslice = event.data[1];
-                                worksDone++;
-
-                                if (i < p) {
-                                    worker.postMessage([N, r, p, B, i++]);
-                                }
-
-                                var length = Bslice.length,
-                                    destPos = Bi * 128 * r,
-                                    srcPos = 0;
-                                while (length--) {
-                                    B[destPos++] = Bslice[srcPos++];
-                                }
-
-                                if (worksDone == p) {
-                                    callback(Crypto.PBKDF2(passwd, B, dkLen, PBKDF2_opts));
-                                }
-                            };
-                            return worker;
-                        };
-                        var workers = [makeWorker(), makeWorker()];
-                        workers[0].postMessage([N, r, p, B, i++]);
-                        if (p > 1) {
-                            workers[1].postMessage([N, r, p, B, i++]);
+                            workerUrl = URL.createObjectURL(blob);
                         }
-                    } catch (e) {
-                        window.setTimeout(function () {
-                            scryptCore();
-                            callback(Crypto.PBKDF2(passwd, B, dkLen, PBKDF2_opts));
-                        }, 0);
-                    }
+                        var worker = new Worker(workerUrl);
+                        worker.onmessage = function (event) {
+                            var Bi = event.data[0],
+                                Bslice = event.data[1];
+                            worksDone++;
 
-                    // using this function to enclose everything needed to create a worker (but also invokable directly for synchronous use)
-                    function scryptCore() {
-                        var XY = [],
-                            V = [];
-
-                        if (typeof B === 'undefined') {
-                            onmessage = function (event) {
-                                var data = event.data;
-                                var N = data[0],
-                                    r = data[1],
-                                    p = data[2],
-                                    B = data[3],
-                                    i = data[4];
-
-                                var Bslice = [];
-                                arraycopy32(B, i * 128 * r, Bslice, 0, 128 * r);
-                                smix(Bslice, 0, r, N, V, XY);
-
-                                postMessage([i, Bslice]);
-                            };
-                        } else {
-                            for (var i = 0; i < p; i++) {
-                                smix(B, i * 128 * r, r, N, V, XY);
-                            }
-                        }
-
-                        function smix(B, Bi, r, N, V, XY) {
-                            var Xi = 0;
-                            var Yi = 128 * r;
-                            var i;
-
-                            arraycopy32(B, Bi, XY, Xi, Yi);
-
-                            for (i = 0; i < N; i++) {
-                                arraycopy32(XY, Xi, V, i * Yi, Yi);
-                                blockmix_salsa8(XY, Xi, Yi, r);
+                            if (i < p) {
+                                worker.postMessage([N, r, p, B, i++]);
                             }
 
-                            for (i = 0; i < N; i++) {
-                                var j = integerify(XY, Xi, r) & (N - 1);
-                                blockxor(V, j * Yi, XY, Xi, Yi);
-                                blockmix_salsa8(XY, Xi, Yi, r);
-                            }
-
-                            arraycopy32(XY, Xi, B, Bi, Yi);
-                        }
-
-                        function blockmix_salsa8(BY, Bi, Yi, r) {
-                            var X = [];
-                            var i;
-
-                            arraycopy32(BY, Bi + (2 * r - 1) * 64, X, 0, 64);
-
-                            for (i = 0; i < 2 * r; i++) {
-                                blockxor(BY, i * 64, X, 0, 64);
-                                salsa20_8(X);
-                                arraycopy32(X, 0, BY, Yi + (i * 64), 64);
-                            }
-
-                            for (i = 0; i < r; i++) {
-                                arraycopy32(BY, Yi + (i * 2) * 64, BY, Bi + (i * 64), 64);
-                            }
-
-                            for (i = 0; i < r; i++) {
-                                arraycopy32(BY, Yi + (i * 2 + 1) * 64, BY, Bi + (i + r) * 64, 64);
-                            }
-                        }
-
-                        function R(a, b) {
-                            return (a << b) | (a >>> (32 - b));
-                        }
-
-                        function salsa20_8(B) {
-                            var B32 = new Array(32);
-                            var x = new Array(32);
-                            var i;
-
-                            for (i = 0; i < 16; i++) {
-                                B32[i] = (B[i * 4 + 0] & 0xff) << 0;
-                                B32[i] |= (B[i * 4 + 1] & 0xff) << 8;
-                                B32[i] |= (B[i * 4 + 2] & 0xff) << 16;
-                                B32[i] |= (B[i * 4 + 3] & 0xff) << 24;
-                            }
-
-                            arraycopy(B32, 0, x, 0, 16);
-
-                            for (i = 8; i > 0; i -= 2) {
-                                x[4] ^= R(x[0] + x[12], 7);
-                                x[8] ^= R(x[4] + x[0], 9);
-                                x[12] ^= R(x[8] + x[4], 13);
-                                x[0] ^= R(x[12] + x[8], 18);
-                                x[9] ^= R(x[5] + x[1], 7);
-                                x[13] ^= R(x[9] + x[5], 9);
-                                x[1] ^= R(x[13] + x[9], 13);
-                                x[5] ^= R(x[1] + x[13], 18);
-                                x[14] ^= R(x[10] + x[6], 7);
-                                x[2] ^= R(x[14] + x[10], 9);
-                                x[6] ^= R(x[2] + x[14], 13);
-                                x[10] ^= R(x[6] + x[2], 18);
-                                x[3] ^= R(x[15] + x[11], 7);
-                                x[7] ^= R(x[3] + x[15], 9);
-                                x[11] ^= R(x[7] + x[3], 13);
-                                x[15] ^= R(x[11] + x[7], 18);
-                                x[1] ^= R(x[0] + x[3], 7);
-                                x[2] ^= R(x[1] + x[0], 9);
-                                x[3] ^= R(x[2] + x[1], 13);
-                                x[0] ^= R(x[3] + x[2], 18);
-                                x[6] ^= R(x[5] + x[4], 7);
-                                x[7] ^= R(x[6] + x[5], 9);
-                                x[4] ^= R(x[7] + x[6], 13);
-                                x[5] ^= R(x[4] + x[7], 18);
-                                x[11] ^= R(x[10] + x[9], 7);
-                                x[8] ^= R(x[11] + x[10], 9);
-                                x[9] ^= R(x[8] + x[11], 13);
-                                x[10] ^= R(x[9] + x[8], 18);
-                                x[12] ^= R(x[15] + x[14], 7);
-                                x[13] ^= R(x[12] + x[15], 9);
-                                x[14] ^= R(x[13] + x[12], 13);
-                                x[15] ^= R(x[14] + x[13], 18);
-                            }
-
-                            for (i = 0; i < 16; ++i) B32[i] = x[i] + B32[i];
-
-                            for (i = 0; i < 16; i++) {
-                                var bi = i * 4;
-                                B[bi + 0] = (B32[i] >> 0 & 0xff);
-                                B[bi + 1] = (B32[i] >> 8 & 0xff);
-                                B[bi + 2] = (B32[i] >> 16 & 0xff);
-                                B[bi + 3] = (B32[i] >> 24 & 0xff);
-                            }
-                        }
-
-                        function blockxor(S, Si, D, Di, len) {
-                            var i = len >> 6;
-                            while (i--) {
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                                D[Di++] ^= S[Si++];
-                            }
-                        }
-
-                        function integerify(B, bi, r) {
-                            var n;
-
-                            bi += (2 * r - 1) * 64;
-
-                            n = (B[bi + 0] & 0xff) << 0;
-                            n |= (B[bi + 1] & 0xff) << 8;
-                            n |= (B[bi + 2] & 0xff) << 16;
-                            n |= (B[bi + 3] & 0xff) << 24;
-
-                            return n;
-                        }
-
-                        function arraycopy(src, srcPos, dest, destPos, length) {
+                            var length = Bslice.length,
+                                destPos = Bi * 128 * r,
+                                srcPos = 0;
                             while (length--) {
-                                dest[destPos++] = src[srcPos++];
+                                B[destPos++] = Bslice[srcPos++];
                             }
-                        }
 
-                        function arraycopy32(src, srcPos, dest, destPos, length) {
-                            var i = length >> 5;
-                            while (i--) {
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
-                                dest[destPos++] = src[srcPos++];
+                            if (worksDone == p) {
+                                callback(Crypto.PBKDF2(passwd, B, dkLen, PBKDF2_opts));
                             }
-                        }
-                    } // scryptCore
-                }; // window.Crypto_scrypt
-            })();
-
-            /*!
-              * Crypto-JS v2.5.4  AES.js
-              * http://code.google.com/p/crypto-js/
-              * Copyright (c) 2009-2013, Jeff Mott. All rights reserved.
-              * http://code.google.com/p/crypto-js/wiki/License
-              */
-            (function () {
-
-                // Shortcuts
-                var C = Crypto,
-                    util = C.util,
-                    charenc = C.charenc,
-                    UTF8 = charenc.UTF8;
-
-                // Precomputed SBOX
-                var SBOX = [0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
-                    0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
-                    0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
-                    0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
-                    0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
-                    0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
-                    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
-                    0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
-                    0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
-                    0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
-                    0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
-                    0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-                    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
-                    0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
-                    0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
-                    0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
-                    0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
-                    0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
-                    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
-                    0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
-                    0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
-                    0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
-                    0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
-                    0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-                    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
-                    0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
-                    0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
-                    0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
-                    0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
-                    0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
-                    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
-                    0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
-                ];
-
-                // Compute inverse SBOX lookup table
-                for (var INVSBOX = [], i = 0; i < 256; i++) INVSBOX[SBOX[i]] = i;
-
-                // Compute multiplication in GF(2^8) lookup tables
-                var MULT2 = [],
-                    MULT3 = [],
-                    MULT9 = [],
-                    MULTB = [],
-                    MULTD = [],
-                    MULTE = [];
-
-                function xtime(a, b) {
-                    for (var result = 0, i = 0; i < 8; i++) {
-                        if (b & 1) result ^= a;
-                        var hiBitSet = a & 0x80;
-                        a = (a << 1) & 0xFF;
-                        if (hiBitSet) a ^= 0x1b;
-                        b >>>= 1;
+                        };
+                        return worker;
+                    };
+                    var workers = [makeWorker(), makeWorker()];
+                    workers[0].postMessage([N, r, p, B, i++]);
+                    if (p > 1) {
+                        workers[1].postMessage([N, r, p, B, i++]);
                     }
-                    return result;
+                } catch (e) {
+                    window.setTimeout(function () {
+                        scryptCore();
+                        callback(Crypto.PBKDF2(passwd, B, dkLen, PBKDF2_opts));
+                    }, 0);
                 }
 
-                for (var i = 0; i < 256; i++) {
-                    MULT2[i] = xtime(i, 2);
-                    MULT3[i] = xtime(i, 3);
-                    MULT9[i] = xtime(i, 9);
-                    MULTB[i] = xtime(i, 0xB);
-                    MULTD[i] = xtime(i, 0xD);
-                    MULTE[i] = xtime(i, 0xE);
+                // using this function to enclose everything needed to create a worker (but also invokable directly for synchronous use)
+                function scryptCore() {
+                    var XY = [],
+                        V = [];
+
+                    if (typeof B === 'undefined') {
+                        onmessage = function (event) {
+                            var data = event.data;
+                            var N = data[0],
+                                r = data[1],
+                                p = data[2],
+                                B = data[3],
+                                i = data[4];
+
+                            var Bslice = [];
+                            arraycopy32(B, i * 128 * r, Bslice, 0, 128 * r);
+                            smix(Bslice, 0, r, N, V, XY);
+
+                            postMessage([i, Bslice]);
+                        };
+                    } else {
+                        for (var i = 0; i < p; i++) {
+                            smix(B, i * 128 * r, r, N, V, XY);
+                        }
+                    }
+
+                    function smix(B, Bi, r, N, V, XY) {
+                        var Xi = 0;
+                        var Yi = 128 * r;
+                        var i;
+
+                        arraycopy32(B, Bi, XY, Xi, Yi);
+
+                        for (i = 0; i < N; i++) {
+                            arraycopy32(XY, Xi, V, i * Yi, Yi);
+                            blockmix_salsa8(XY, Xi, Yi, r);
+                        }
+
+                        for (i = 0; i < N; i++) {
+                            var j = integerify(XY, Xi, r) & (N - 1);
+                            blockxor(V, j * Yi, XY, Xi, Yi);
+                            blockmix_salsa8(XY, Xi, Yi, r);
+                        }
+
+                        arraycopy32(XY, Xi, B, Bi, Yi);
+                    }
+
+                    function blockmix_salsa8(BY, Bi, Yi, r) {
+                        var X = [];
+                        var i;
+
+                        arraycopy32(BY, Bi + (2 * r - 1) * 64, X, 0, 64);
+
+                        for (i = 0; i < 2 * r; i++) {
+                            blockxor(BY, i * 64, X, 0, 64);
+                            salsa20_8(X);
+                            arraycopy32(X, 0, BY, Yi + (i * 64), 64);
+                        }
+
+                        for (i = 0; i < r; i++) {
+                            arraycopy32(BY, Yi + (i * 2) * 64, BY, Bi + (i * 64), 64);
+                        }
+
+                        for (i = 0; i < r; i++) {
+                            arraycopy32(BY, Yi + (i * 2 + 1) * 64, BY, Bi + (i + r) * 64, 64);
+                        }
+                    }
+
+                    function R(a, b) {
+                        return (a << b) | (a >>> (32 - b));
+                    }
+
+                    function salsa20_8(B) {
+                        var B32 = new Array(32);
+                        var x = new Array(32);
+                        var i;
+
+                        for (i = 0; i < 16; i++) {
+                            B32[i] = (B[i * 4 + 0] & 0xff) << 0;
+                            B32[i] |= (B[i * 4 + 1] & 0xff) << 8;
+                            B32[i] |= (B[i * 4 + 2] & 0xff) << 16;
+                            B32[i] |= (B[i * 4 + 3] & 0xff) << 24;
+                        }
+
+                        arraycopy(B32, 0, x, 0, 16);
+
+                        for (i = 8; i > 0; i -= 2) {
+                            x[4] ^= R(x[0] + x[12], 7);
+                            x[8] ^= R(x[4] + x[0], 9);
+                            x[12] ^= R(x[8] + x[4], 13);
+                            x[0] ^= R(x[12] + x[8], 18);
+                            x[9] ^= R(x[5] + x[1], 7);
+                            x[13] ^= R(x[9] + x[5], 9);
+                            x[1] ^= R(x[13] + x[9], 13);
+                            x[5] ^= R(x[1] + x[13], 18);
+                            x[14] ^= R(x[10] + x[6], 7);
+                            x[2] ^= R(x[14] + x[10], 9);
+                            x[6] ^= R(x[2] + x[14], 13);
+                            x[10] ^= R(x[6] + x[2], 18);
+                            x[3] ^= R(x[15] + x[11], 7);
+                            x[7] ^= R(x[3] + x[15], 9);
+                            x[11] ^= R(x[7] + x[3], 13);
+                            x[15] ^= R(x[11] + x[7], 18);
+                            x[1] ^= R(x[0] + x[3], 7);
+                            x[2] ^= R(x[1] + x[0], 9);
+                            x[3] ^= R(x[2] + x[1], 13);
+                            x[0] ^= R(x[3] + x[2], 18);
+                            x[6] ^= R(x[5] + x[4], 7);
+                            x[7] ^= R(x[6] + x[5], 9);
+                            x[4] ^= R(x[7] + x[6], 13);
+                            x[5] ^= R(x[4] + x[7], 18);
+                            x[11] ^= R(x[10] + x[9], 7);
+                            x[8] ^= R(x[11] + x[10], 9);
+                            x[9] ^= R(x[8] + x[11], 13);
+                            x[10] ^= R(x[9] + x[8], 18);
+                            x[12] ^= R(x[15] + x[14], 7);
+                            x[13] ^= R(x[12] + x[15], 9);
+                            x[14] ^= R(x[13] + x[12], 13);
+                            x[15] ^= R(x[14] + x[13], 18);
+                        }
+
+                        for (i = 0; i < 16; ++i) B32[i] = x[i] + B32[i];
+
+                        for (i = 0; i < 16; i++) {
+                            var bi = i * 4;
+                            B[bi + 0] = (B32[i] >> 0 & 0xff);
+                            B[bi + 1] = (B32[i] >> 8 & 0xff);
+                            B[bi + 2] = (B32[i] >> 16 & 0xff);
+                            B[bi + 3] = (B32[i] >> 24 & 0xff);
+                        }
+                    }
+
+                    function blockxor(S, Si, D, Di, len) {
+                        var i = len >> 6;
+                        while (i--) {
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                            D[Di++] ^= S[Si++];
+                        }
+                    }
+
+                    function integerify(B, bi, r) {
+                        var n;
+
+                        bi += (2 * r - 1) * 64;
+
+                        n = (B[bi + 0] & 0xff) << 0;
+                        n |= (B[bi + 1] & 0xff) << 8;
+                        n |= (B[bi + 2] & 0xff) << 16;
+                        n |= (B[bi + 3] & 0xff) << 24;
+
+                        return n;
+                    }
+
+                    function arraycopy(src, srcPos, dest, destPos, length) {
+                        while (length--) {
+                            dest[destPos++] = src[srcPos++];
+                        }
+                    }
+
+                    function arraycopy32(src, srcPos, dest, destPos, length) {
+                        var i = length >> 5;
+                        while (i--) {
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                            dest[destPos++] = src[srcPos++];
+                        }
+                    }
+                } // scryptCore
+            }; // window.Crypto_scrypt
+        })();
+
+      /*!
+        * Crypto-JS v2.5.4  AES.js
+        * http://code.google.com/p/crypto-js/
+        * Copyright (c) 2009-2013, Jeff Mott. All rights reserved.
+        * http://code.google.com/p/crypto-js/wiki/License
+        */
+        (function () {
+
+            // Shortcuts
+            var C = Crypto,
+                util = C.util,
+                charenc = C.charenc,
+                UTF8 = charenc.UTF8;
+
+            // Precomputed SBOX
+            var SBOX = [0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5,
+                0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
+                0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
+                0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
+                0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc,
+                0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
+                0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a,
+                0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
+                0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
+                0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
+                0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b,
+                0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
+                0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85,
+                0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
+                0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
+                0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
+                0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17,
+                0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
+                0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88,
+                0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
+                0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
+                0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
+                0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9,
+                0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
+                0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6,
+                0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
+                0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
+                0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
+                0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94,
+                0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
+                0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68,
+                0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16
+            ];
+
+            // Compute inverse SBOX lookup table
+            for (var INVSBOX = [], i = 0; i < 256; i++) INVSBOX[SBOX[i]] = i;
+
+            // Compute multiplication in GF(2^8) lookup tables
+            var MULT2 = [],
+                MULT3 = [],
+                MULT9 = [],
+                MULTB = [],
+                MULTD = [],
+                MULTE = [];
+
+            function xtime(a, b) {
+                for (var result = 0, i = 0; i < 8; i++) {
+                    if (b & 1) result ^= a;
+                    var hiBitSet = a & 0x80;
+                    a = (a << 1) & 0xFF;
+                    if (hiBitSet) a ^= 0x1b;
+                    b >>>= 1;
                 }
+                return result;
+            }
 
-                // Precomputed RCon lookup
-                var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+            for (var i = 0; i < 256; i++) {
+                MULT2[i] = xtime(i, 2);
+                MULT3[i] = xtime(i, 3);
+                MULT9[i] = xtime(i, 9);
+                MULTB[i] = xtime(i, 0xB);
+                MULTD[i] = xtime(i, 0xD);
+                MULTE[i] = xtime(i, 0xE);
+            }
 
-                // Inner state
-                var state = [
+            // Precomputed RCon lookup
+            var RCON = [0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+
+            // Inner state
+            var state = [
                     [],
                     [],
                     [],
                     []
                 ],
-                    keylength,
-                    nrounds,
-                    keyschedule;
+                keylength,
+                nrounds,
+                keyschedule;
 
-                var AES = C.AES = {
+            var AES = C.AES = {
 
-                    /**
-                    * Public API
-                    */
+                /**
+                * Public API
+                */
 
-                    encrypt: function (message, password, options) {
+                encrypt: function (message, password, options) {
 
-                        options = options || {};
+                    options = options || {};
 
-                        // Determine mode
-                        var mode = options.mode || new C.mode.OFB;
+                    // Determine mode
+                    var mode = options.mode || new C.mode.OFB;
 
-                        // Allow mode to override options
-                        if (mode.fixOptions) mode.fixOptions(options);
+                    // Allow mode to override options
+                    if (mode.fixOptions) mode.fixOptions(options);
 
-                        var
+                    var
 
-                            // Convert to bytes if message is a string
-                            m = (
-                                message.constructor == String ?
-                                    UTF8.stringToBytes(message) :
-                                    message
-                            ),
+                        // Convert to bytes if message is a string
+                        m = (
+                            message.constructor == String ?
+                            UTF8.stringToBytes(message) :
+                            message
+                        ),
 
-                            // Generate random IV
-                            iv = options.iv || util.randomBytes(AES._blocksize * 4),
+                        // Generate random IV
+                        iv = options.iv || util.randomBytes(AES._blocksize * 4),
 
-                            // Generate key
-                            k = (
-                                password.constructor == String ?
-                                    // Derive key from pass-phrase
-                                    C.PBKDF2(password, iv, 32, {
-                                        asBytes: true
-                                    }) :
-                                    // else, assume byte array representing cryptographic key
-                                    password
-                            );
+                        // Generate key
+                        k = (
+                            password.constructor == String ?
+                            // Derive key from pass-phrase
+                            C.PBKDF2(password, iv, 32, {
+                                asBytes: true
+                            }) :
+                            // else, assume byte array representing cryptographic key
+                            password
+                        );
 
-                        // Encrypt
-                        AES._init(k);
-                        mode.encrypt(AES, m, iv);
+                    // Encrypt
+                    AES._init(k);
+                    mode.encrypt(AES, m, iv);
 
-                        // Return ciphertext
-                        m = options.iv ? m : iv.concat(m);
-                        return (options && options.asBytes) ? m : util.bytesToBase64(m);
+                    // Return ciphertext
+                    m = options.iv ? m : iv.concat(m);
+                    return (options && options.asBytes) ? m : util.bytesToBase64(m);
 
-                    },
+                },
 
-                    decrypt: function (ciphertext, password, options) {
+                decrypt: function (ciphertext, password, options) {
 
-                        options = options || {};
+                    options = options || {};
 
-                        // Determine mode
-                        var mode = options.mode || new C.mode.OFB;
+                    // Determine mode
+                    var mode = options.mode || new C.mode.OFB;
 
-                        // Allow mode to override options
-                        if (mode.fixOptions) mode.fixOptions(options);
+                    // Allow mode to override options
+                    if (mode.fixOptions) mode.fixOptions(options);
 
-                        var
+                    var
 
-                            // Convert to bytes if ciphertext is a string
-                            c = (
-                                ciphertext.constructor == String ?
-                                    util.base64ToBytes(ciphertext) :
-                                    ciphertext
-                            ),
+                        // Convert to bytes if ciphertext is a string
+                        c = (
+                            ciphertext.constructor == String ?
+                            util.base64ToBytes(ciphertext) :
+                            ciphertext
+                        ),
 
-                            // Separate IV and message
-                            iv = options.iv || c.splice(0, AES._blocksize * 4),
+                        // Separate IV and message
+                        iv = options.iv || c.splice(0, AES._blocksize * 4),
 
-                            // Generate key
-                            k = (
-                                password.constructor == String ?
-                                    // Derive key from pass-phrase
-                                    C.PBKDF2(password, iv, 32, {
-                                        asBytes: true
-                                    }) :
-                                    // else, assume byte array representing cryptographic key
-                                    password
-                            );
+                        // Generate key
+                        k = (
+                            password.constructor == String ?
+                            // Derive key from pass-phrase
+                            C.PBKDF2(password, iv, 32, {
+                                asBytes: true
+                            }) :
+                            // else, assume byte array representing cryptographic key
+                            password
+                        );
 
-                        // Decrypt
-                        AES._init(k);
-                        mode.decrypt(AES, c, iv);
+                    // Decrypt
+                    AES._init(k);
+                    mode.decrypt(AES, c, iv);
 
-                        // Return plaintext
-                        return (options && options.asBytes) ? c : UTF8.bytesToString(c);
+                    // Return plaintext
+                    return (options && options.asBytes) ? c : UTF8.bytesToString(c);
 
-                    },
+                },
 
 
-                    /**
-                    * Package private methods and properties
-                    */
+                /**
+                * Package private methods and properties
+                */
 
-                    _blocksize: 4,
+                _blocksize: 4,
 
-                    _encryptblock: function (m, offset) {
+                _encryptblock: function (m, offset) {
 
-                        // Set input
-                        for (var row = 0; row < AES._blocksize; row++) {
-                            for (var col = 0; col < 4; col++)
-                                state[row][col] = m[offset + col * 4 + row];
-                        }
+                    // Set input
+                    for (var row = 0; row < AES._blocksize; row++) {
+                        for (var col = 0; col < 4; col++)
+                            state[row][col] = m[offset + col * 4 + row];
+                    }
 
-                        // Add round key
-                        for (var row = 0; row < 4; row++) {
-                            for (var col = 0; col < 4; col++)
-                                state[row][col] ^= keyschedule[col][row];
-                        }
+                    // Add round key
+                    for (var row = 0; row < 4; row++) {
+                        for (var col = 0; col < 4; col++)
+                            state[row][col] ^= keyschedule[col][row];
+                    }
 
-                        for (var round = 1; round < nrounds; round++) {
-
-                            // Sub bytes
-                            for (var row = 0; row < 4; row++) {
-                                for (var col = 0; col < 4; col++)
-                                    state[row][col] = SBOX[state[row][col]];
-                            }
-
-                            // Shift rows
-                            state[1].push(state[1].shift());
-                            state[2].push(state[2].shift());
-                            state[2].push(state[2].shift());
-                            state[3].unshift(state[3].pop());
-
-                            // Mix columns
-                            for (var col = 0; col < 4; col++) {
-
-                                var s0 = state[0][col],
-                                    s1 = state[1][col],
-                                    s2 = state[2][col],
-                                    s3 = state[3][col];
-
-                                state[0][col] = MULT2[s0] ^ MULT3[s1] ^ s2 ^ s3;
-                                state[1][col] = s0 ^ MULT2[s1] ^ MULT3[s2] ^ s3;
-                                state[2][col] = s0 ^ s1 ^ MULT2[s2] ^ MULT3[s3];
-                                state[3][col] = MULT3[s0] ^ s1 ^ s2 ^ MULT2[s3];
-
-                            }
-
-                            // Add round key
-                            for (var row = 0; row < 4; row++) {
-                                for (var col = 0; col < 4; col++)
-                                    state[row][col] ^= keyschedule[round * 4 + col][row];
-                            }
-
-                        }
+                    for (var round = 1; round < nrounds; round++) {
 
                         // Sub bytes
                         for (var row = 0; row < 4; row++) {
@@ -3900,70 +3870,70 @@
                         state[2].push(state[2].shift());
                         state[3].unshift(state[3].pop());
 
-                        // Add round key
-                        for (var row = 0; row < 4; row++) {
-                            for (var col = 0; col < 4; col++)
-                                state[row][col] ^= keyschedule[nrounds * 4 + col][row];
-                        }
+                        // Mix columns
+                        for (var col = 0; col < 4; col++) {
 
-                        // Set output
-                        for (var row = 0; row < AES._blocksize; row++) {
-                            for (var col = 0; col < 4; col++)
-                                m[offset + col * 4 + row] = state[row][col];
-                        }
+                            var s0 = state[0][col],
+                                s1 = state[1][col],
+                                s2 = state[2][col],
+                                s3 = state[3][col];
 
-                    },
+                            state[0][col] = MULT2[s0] ^ MULT3[s1] ^ s2 ^ s3;
+                            state[1][col] = s0 ^ MULT2[s1] ^ MULT3[s2] ^ s3;
+                            state[2][col] = s0 ^ s1 ^ MULT2[s2] ^ MULT3[s3];
+                            state[3][col] = MULT3[s0] ^ s1 ^ s2 ^ MULT2[s3];
 
-                    _decryptblock: function (c, offset) {
-
-                        // Set input
-                        for (var row = 0; row < AES._blocksize; row++) {
-                            for (var col = 0; col < 4; col++)
-                                state[row][col] = c[offset + col * 4 + row];
                         }
 
                         // Add round key
                         for (var row = 0; row < 4; row++) {
                             for (var col = 0; col < 4; col++)
-                                state[row][col] ^= keyschedule[nrounds * 4 + col][row];
+                                state[row][col] ^= keyschedule[round * 4 + col][row];
                         }
 
-                        for (var round = 1; round < nrounds; round++) {
+                    }
 
-                            // Inv shift rows
-                            state[1].unshift(state[1].pop());
-                            state[2].push(state[2].shift());
-                            state[2].push(state[2].shift());
-                            state[3].push(state[3].shift());
+                    // Sub bytes
+                    for (var row = 0; row < 4; row++) {
+                        for (var col = 0; col < 4; col++)
+                            state[row][col] = SBOX[state[row][col]];
+                    }
 
-                            // Inv sub bytes
-                            for (var row = 0; row < 4; row++) {
-                                for (var col = 0; col < 4; col++)
-                                    state[row][col] = INVSBOX[state[row][col]];
-                            }
+                    // Shift rows
+                    state[1].push(state[1].shift());
+                    state[2].push(state[2].shift());
+                    state[2].push(state[2].shift());
+                    state[3].unshift(state[3].pop());
 
-                            // Add round key
-                            for (var row = 0; row < 4; row++) {
-                                for (var col = 0; col < 4; col++)
-                                    state[row][col] ^= keyschedule[(nrounds - round) * 4 + col][row];
-                            }
+                    // Add round key
+                    for (var row = 0; row < 4; row++) {
+                        for (var col = 0; col < 4; col++)
+                            state[row][col] ^= keyschedule[nrounds * 4 + col][row];
+                    }
 
-                            // Inv mix columns
-                            for (var col = 0; col < 4; col++) {
+                    // Set output
+                    for (var row = 0; row < AES._blocksize; row++) {
+                        for (var col = 0; col < 4; col++)
+                            m[offset + col * 4 + row] = state[row][col];
+                    }
 
-                                var s0 = state[0][col],
-                                    s1 = state[1][col],
-                                    s2 = state[2][col],
-                                    s3 = state[3][col];
+                },
 
-                                state[0][col] = MULTE[s0] ^ MULTB[s1] ^ MULTD[s2] ^ MULT9[s3];
-                                state[1][col] = MULT9[s0] ^ MULTE[s1] ^ MULTB[s2] ^ MULTD[s3];
-                                state[2][col] = MULTD[s0] ^ MULT9[s1] ^ MULTE[s2] ^ MULTB[s3];
-                                state[3][col] = MULTB[s0] ^ MULTD[s1] ^ MULT9[s2] ^ MULTE[s3];
+                _decryptblock: function (c, offset) {
 
-                            }
+                    // Set input
+                    for (var row = 0; row < AES._blocksize; row++) {
+                        for (var col = 0; col < 4; col++)
+                            state[row][col] = c[offset + col * 4 + row];
+                    }
 
-                        }
+                    // Add round key
+                    for (var row = 0; row < 4; row++) {
+                        for (var col = 0; col < 4; col++)
+                            state[row][col] ^= keyschedule[nrounds * 4 + col][row];
+                    }
+
+                    for (var round = 1; round < nrounds; round++) {
 
                         // Inv shift rows
                         state[1].unshift(state[1].pop());
@@ -3980,89 +3950,124 @@
                         // Add round key
                         for (var row = 0; row < 4; row++) {
                             for (var col = 0; col < 4; col++)
-                                state[row][col] ^= keyschedule[col][row];
+                                state[row][col] ^= keyschedule[(nrounds - round) * 4 + col][row];
                         }
 
-                        // Set output
-                        for (var row = 0; row < AES._blocksize; row++) {
-                            for (var col = 0; col < 4; col++)
-                                c[offset + col * 4 + row] = state[row][col];
-                        }
+                        // Inv mix columns
+                        for (var col = 0; col < 4; col++) {
 
-                    },
+                            var s0 = state[0][col],
+                                s1 = state[1][col],
+                                s2 = state[2][col],
+                                s3 = state[3][col];
 
-
-                    /**
-                    * Private methods
-                    */
-
-                    _init: function (k) {
-                        keylength = k.length / 4;
-                        nrounds = keylength + 6;
-                        AES._keyexpansion(k);
-                    },
-
-                    // Generate a key schedule
-                    _keyexpansion: function (k) {
-
-                        keyschedule = [];
-
-                        for (var row = 0; row < keylength; row++) {
-                            keyschedule[row] = [
-                                k[row * 4],
-                                k[row * 4 + 1],
-                                k[row * 4 + 2],
-                                k[row * 4 + 3]
-                            ];
-                        }
-
-                        for (var row = keylength; row < AES._blocksize * (nrounds + 1); row++) {
-
-                            var temp = [
-                                keyschedule[row - 1][0],
-                                keyschedule[row - 1][1],
-                                keyschedule[row - 1][2],
-                                keyschedule[row - 1][3]
-                            ];
-
-                            if (row % keylength == 0) {
-
-                                // Rot word
-                                temp.push(temp.shift());
-
-                                // Sub word
-                                temp[0] = SBOX[temp[0]];
-                                temp[1] = SBOX[temp[1]];
-                                temp[2] = SBOX[temp[2]];
-                                temp[3] = SBOX[temp[3]];
-
-                                temp[0] ^= RCON[row / keylength];
-
-                            } else if (keylength > 6 && row % keylength == 4) {
-
-                                // Sub word
-                                temp[0] = SBOX[temp[0]];
-                                temp[1] = SBOX[temp[1]];
-                                temp[2] = SBOX[temp[2]];
-                                temp[3] = SBOX[temp[3]];
-
-                            }
-
-                            keyschedule[row] = [
-                                keyschedule[row - keylength][0] ^ temp[0],
-                                keyschedule[row - keylength][1] ^ temp[1],
-                                keyschedule[row - keylength][2] ^ temp[2],
-                                keyschedule[row - keylength][3] ^ temp[3]
-                            ];
+                            state[0][col] = MULTE[s0] ^ MULTB[s1] ^ MULTD[s2] ^ MULT9[s3];
+                            state[1][col] = MULT9[s0] ^ MULTE[s1] ^ MULTB[s2] ^ MULTD[s3];
+                            state[2][col] = MULTD[s0] ^ MULT9[s1] ^ MULTE[s2] ^ MULTB[s3];
+                            state[3][col] = MULTB[s0] ^ MULTD[s1] ^ MULT9[s2] ^ MULTE[s3];
 
                         }
 
                     }
 
-                };
+                    // Inv shift rows
+                    state[1].unshift(state[1].pop());
+                    state[2].push(state[2].shift());
+                    state[2].push(state[2].shift());
+                    state[3].push(state[3].shift());
 
-            })();
+                    // Inv sub bytes
+                    for (var row = 0; row < 4; row++) {
+                        for (var col = 0; col < 4; col++)
+                            state[row][col] = INVSBOX[state[row][col]];
+                    }
 
+                    // Add round key
+                    for (var row = 0; row < 4; row++) {
+                        for (var col = 0; col < 4; col++)
+                            state[row][col] ^= keyschedule[col][row];
+                    }
+
+                    // Set output
+                    for (var row = 0; row < AES._blocksize; row++) {
+                        for (var col = 0; col < 4; col++)
+                            c[offset + col * 4 + row] = state[row][col];
+                    }
+
+                },
+
+
+                /**
+                * Private methods
+                */
+
+                _init: function (k) {
+                    keylength = k.length / 4;
+                    nrounds = keylength + 6;
+                    AES._keyexpansion(k);
+                },
+
+                // Generate a key schedule
+                _keyexpansion: function (k) {
+
+                    keyschedule = [];
+
+                    for (var row = 0; row < keylength; row++) {
+                        keyschedule[row] = [
+                            k[row * 4],
+                            k[row * 4 + 1],
+                            k[row * 4 + 2],
+                            k[row * 4 + 3]
+                        ];
+                    }
+
+                    for (var row = keylength; row < AES._blocksize * (nrounds + 1); row++) {
+
+                        var temp = [
+                            keyschedule[row - 1][0],
+                            keyschedule[row - 1][1],
+                            keyschedule[row - 1][2],
+                            keyschedule[row - 1][3]
+                        ];
+
+                        if (row % keylength == 0) {
+
+                            // Rot word
+                            temp.push(temp.shift());
+
+                            // Sub word
+                            temp[0] = SBOX[temp[0]];
+                            temp[1] = SBOX[temp[1]];
+                            temp[2] = SBOX[temp[2]];
+                            temp[3] = SBOX[temp[3]];
+
+                            temp[0] ^= RCON[row / keylength];
+
+                        } else if (keylength > 6 && row % keylength == 4) {
+
+                            // Sub word
+                            temp[0] = SBOX[temp[0]];
+                            temp[1] = SBOX[temp[1]];
+                            temp[2] = SBOX[temp[2]];
+                            temp[3] = SBOX[temp[3]];
+
+                        }
+
+                        keyschedule[row] = [
+                            keyschedule[row - keylength][0] ^ temp[0],
+                            keyschedule[row - keylength][1] ^ temp[1],
+                            keyschedule[row - keylength][2] ^ temp[2],
+                            keyschedule[row - keylength][3] ^ temp[3]
+                        ];
+
+                    }
+
+                }
+
+            };
+
+        })();
+  
             /*
              * Copyright (c) 2000 - 2011 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)
              * Ported to JavaScript by bitaddress.org
@@ -4636,7 +4641,7 @@
         //bitTrx.js
         (function () {
 
-            var bitjs = window.bitjs = function () { };
+            var bitjs = window.bitjs = function () {};
 
             /* public vars */
             bitjs.pub = 0x23; // flochange - changed the prefix to FLO Mainnet PublicKey Prefix 0x23
@@ -5072,26 +5077,26 @@
                         buffer = buffer.concat(scriptBytes);
                     }
 
-                    buffer = buffer.concat(bitjs.numToBytes(parseInt(this.locktime), 4));
+                    buffer = buffer.concat(bitjs.numToBytes(parseInt(this.locktime),4));
                     flohex = ascii_to_hexa(this.floData);
                     floDataCount = this.floData.length;
 
                     //flochange -- creating unique data character count logic for floData. This string is prefixed before actual floData string in Raw Transaction
                     if (floDataCount < 16) {
-                        floDataCountString = floDataCount.toString(16);
-                        floDataCountString = "0" + floDataCountString;
+                                  floDataCountString = floDataCount.toString(16);
+                                  floDataCountString = "0"+ floDataCountString;
                     } else if (floDataCount < 253) {
-                        floDataCountString = floDataCount.toString(16);
+                                  floDataCountString = floDataCount.toString(16);
                     } else if (floDataCount <= 1040) {
-                        floDataCountAdjusted = (floDataCount - 253) + parseInt("0xfd00fd");
-                        floDataCountStringAdjusted = floDataCountAdjusted.toString(16);
-                        floDataCountString = floDataCountStringAdjusted.substr(0, 2) + floDataCountStringAdjusted.substr(4, 2) + floDataCountStringAdjusted.substr(2, 2);
+                                  floDataCountAdjusted = (floDataCount - 253) +  parseInt("0xfd00fd");
+                                  floDataCountStringAdjusted = floDataCountAdjusted.toString(16);
+                                  floDataCountString = floDataCountStringAdjusted.substr(0,2)+ floDataCountStringAdjusted.substr(4,2)+ floDataCountStringAdjusted.substr(2,2);
                     } else {
-                        floDataCountString = "Character Limit Exceeded";
-                    }
+                                  floDataCountString = "Character Limit Exceeded";
+                              }
 
 
-                    return Crypto.util.bytesToHex(buffer) + floDataCountString + flohex;    // flochange -- Addition of floDataCountString and floData in serialization
+                    return Crypto.util.bytesToHex(buffer)+floDataCountString+flohex;    // flochange -- Addition of floDataCountString and floData in serialization
                 }
 
 
@@ -5220,951 +5225,948 @@
 
 
 
-        /*
-        Copyright (c) 2011 Stefan Thomas
-        
-        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.
-        */
+/*
+Copyright (c) 2011 Stefan Thomas
+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.
+*/
 
-        //https://raw.github.com/bitcoinjs/bitcoinjs-lib/1a7fc9d063f864058809d06ef4542af40be3558f/src/bitcoin.js
-        (function (exports) {
-            var Bitcoin = exports;
-        })(
-            'object' === typeof module ? module.exports : (window.Bitcoin = {})
-        );
+//https://raw.github.com/bitcoinjs/bitcoinjs-lib/1a7fc9d063f864058809d06ef4542af40be3558f/src/bitcoin.js
+(function (exports) {
+    var Bitcoin = exports;
+})(
+    'object' === typeof module ? module.exports : (window.Bitcoin = {})
+);
 
-        //https://raw.github.com/bitcoinjs/bitcoinjs-lib/c952aaeb3ee472e3776655b8ea07299ebed702c7/src/base58.js
-        (function (Bitcoin) {
-            Bitcoin.Base58 = {
-                alphabet: "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz",
-                validRegex: /^[1-9A-HJ-NP-Za-km-z]+$/,
-                base: BigInteger.valueOf(58),
-
-                /**
-                * Convert a byte array to a base58-encoded string.
-                *
-                * Written by Mike Hearn for BitcoinJ.
-                *   Copyright (c) 2011 Google Inc.
-                *
-                * Ported to JavaScript by Stefan Thomas.
-                */
-                encode: function (input) {
-                    var bi = BigInteger.fromByteArrayUnsigned(input);
-                    var chars = [];
-
-                    while (bi.compareTo(B58.base) >= 0) {
-                        var mod = bi.mod(B58.base);
-                        chars.unshift(B58.alphabet[mod.intValue()]);
-                        bi = bi.subtract(mod).divide(B58.base);
-                    }
-                    chars.unshift(B58.alphabet[bi.intValue()]);
-
-                    // Convert leading zeros too.
-                    for (var i = 0; i < input.length; i++) {
-                        if (input[i] == 0x00) {
-                            chars.unshift(B58.alphabet[0]);
-                        } else break;
-                    }
-
-                    return chars.join('');
-                },
-
-                /**
-                * Convert a base58-encoded string to a byte array.
-                *
-                * Written by Mike Hearn for BitcoinJ.
-                *   Copyright (c) 2011 Google Inc.
-                *
-                * Ported to JavaScript by Stefan Thomas.
-                */
-                decode: function (input) {
-                    var bi = BigInteger.valueOf(0);
-                    var leadingZerosNum = 0;
-                    for (var i = input.length - 1; i >= 0; i--) {
-                        var alphaIndex = B58.alphabet.indexOf(input[i]);
-                        if (alphaIndex < 0) {
-                            throw "Invalid character";
-                        }
-                        bi = bi.add(BigInteger.valueOf(alphaIndex)
-                            .multiply(B58.base.pow(input.length - 1 - i)));
-
-                        // This counts leading zero bytes
-                        if (input[i] == "1") leadingZerosNum++;
-                        else leadingZerosNum = 0;
-                    }
-                    var bytes = bi.toByteArrayUnsigned();
-
-                    // Add leading zeros
-                    while (leadingZerosNum-- > 0) bytes.unshift(0);
-
-                    return bytes;
-                }
-            };
-
-            var B58 = Bitcoin.Base58;
-        })(
-            'undefined' != typeof Bitcoin ? Bitcoin : module.exports
-        );
-        //https://raw.github.com/bitcoinjs/bitcoinjs-lib/09e8c6e184d6501a0c2c59d73ca64db5c0d3eb95/src/address.js
-        Bitcoin.Address = function (bytes) {
-            if (floGlobals.blockchain == "FLO")
-                this.version = 0x23; // FLO mainnet public address
-            else if (floGlobals.blockchain == "FLO_TEST")
-                this.version = 0x73; // FLO testnet public address
-            if ("string" == typeof bytes) {
-                bytes = Bitcoin.Address.decodeString(bytes, this.version);
-            }
-            this.hash = bytes;
-        };
-
-        Bitcoin.Address.networkVersion = 0x23; // (FLO mainnet 0x23, 35D), (Bitcoin Mainnet, 0x00, 0D) // *this has no effect *
+//https://raw.github.com/bitcoinjs/bitcoinjs-lib/c952aaeb3ee472e3776655b8ea07299ebed702c7/src/base58.js
+(function (Bitcoin) {
+    Bitcoin.Base58 = {
+        alphabet: "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz",
+        validRegex: /^[1-9A-HJ-NP-Za-km-z]+$/,
+        base: BigInteger.valueOf(58),
 
         /**
-        * Serialize this object as a standard Bitcoin address.
+        * Convert a byte array to a base58-encoded string.
         *
-        * Returns the address as a base58-encoded string in the standardized format.
+        * Written by Mike Hearn for BitcoinJ.
+        *   Copyright (c) 2011 Google Inc.
+        *
+        * Ported to JavaScript by Stefan Thomas.
         */
-        Bitcoin.Address.prototype.toString = function () {
-            // Get a copy of the hash
-            var hash = this.hash.slice(0);
+        encode: function (input) {
+            var bi = BigInteger.fromByteArrayUnsigned(input);
+            var chars = [];
 
-            // Version
-            hash.unshift(this.version);
-            var checksum = Crypto.SHA256(Crypto.SHA256(hash, { asBytes: true }), { asBytes: true });
-            var bytes = hash.concat(checksum.slice(0, 4));
-            return Bitcoin.Base58.encode(bytes);
-        };
+            while (bi.compareTo(B58.base) >= 0) {
+                var mod = bi.mod(B58.base);
+                chars.unshift(B58.alphabet[mod.intValue()]);
+                bi = bi.subtract(mod).divide(B58.base);
+            }
+            chars.unshift(B58.alphabet[bi.intValue()]);
 
-        Bitcoin.Address.prototype.getHashBase64 = function () {
-            return Crypto.util.bytesToBase64(this.hash);
-        };
+            // Convert leading zeros too.
+            for (var i = 0; i < input.length; i++) {
+                if (input[i] == 0x00) {
+                    chars.unshift(B58.alphabet[0]);
+                } else break;
+            }
+
+            return chars.join('');
+        },
 
         /**
-        * Parse a Bitcoin address contained in a string.
+        * Convert a base58-encoded string to a byte array.
+        *
+        * Written by Mike Hearn for BitcoinJ.
+        *   Copyright (c) 2011 Google Inc.
+        *
+        * Ported to JavaScript by Stefan Thomas.
         */
-        Bitcoin.Address.decodeString = function (string, version) {
-            var bytes = Bitcoin.Base58.decode(string);
-            var hash = bytes.slice(0, 21);
-            var checksum = Crypto.SHA256(Crypto.SHA256(hash, { asBytes: true }), { asBytes: true });
+        decode: function (input) {
+            var bi = BigInteger.valueOf(0);
+            var leadingZerosNum = 0;
+            for (var i = input.length - 1; i >= 0; i--) {
+                var alphaIndex = B58.alphabet.indexOf(input[i]);
+                if (alphaIndex < 0) {
+                    throw "Invalid character";
+                }
+                bi = bi.add(BigInteger.valueOf(alphaIndex)
+                                .multiply(B58.base.pow(input.length - 1 - i)));
 
-            if (checksum[0] != bytes[21] ||
-                checksum[1] != bytes[22] ||
-                checksum[2] != bytes[23] ||
-                checksum[3] != bytes[24]) {
-                throw "Checksum validation failed!";
+                // This counts leading zero bytes
+                if (input[i] == "1") leadingZerosNum++;
+                else leadingZerosNum = 0;
+            }
+            var bytes = bi.toByteArrayUnsigned();
+
+            // Add leading zeros
+            while (leadingZerosNum-- > 0) bytes.unshift(0);
+
+            return bytes;
+        }
+    };
+
+    var B58 = Bitcoin.Base58;
+})(
+    'undefined' != typeof Bitcoin ? Bitcoin : module.exports
+);
+//https://raw.github.com/bitcoinjs/bitcoinjs-lib/09e8c6e184d6501a0c2c59d73ca64db5c0d3eb95/src/address.js
+Bitcoin.Address = function (bytes) {
+    if(floGlobals.blockchain == "FLO")
+        this.version = 0x23; // FLO mainnet public address
+    else if(floGlobals.blockchain == "FLO_TEST")
+        this.version = 0x73; // FLO testnet public address
+    if ("string" == typeof bytes) {
+        bytes = Bitcoin.Address.decodeString(bytes,this.version);
+    }
+    this.hash = bytes;
+};
+
+Bitcoin.Address.networkVersion = 0x23; // (FLO mainnet 0x23, 35D), (Bitcoin Mainnet, 0x00, 0D) // *this has no effect *
+
+/**
+* Serialize this object as a standard Bitcoin address.
+*
+* Returns the address as a base58-encoded string in the standardized format.
+*/
+Bitcoin.Address.prototype.toString = function () {
+    // Get a copy of the hash
+    var hash = this.hash.slice(0);
+
+    // Version
+    hash.unshift(this.version);
+    var checksum = Crypto.SHA256(Crypto.SHA256(hash, { asBytes: true }), { asBytes: true });
+    var bytes = hash.concat(checksum.slice(0, 4));
+    return Bitcoin.Base58.encode(bytes);
+};
+
+Bitcoin.Address.prototype.getHashBase64 = function () {
+    return Crypto.util.bytesToBase64(this.hash);
+};
+
+/**
+* Parse a Bitcoin address contained in a string.
+*/
+Bitcoin.Address.decodeString = function (string,version) {
+    var bytes = Bitcoin.Base58.decode(string);
+    var hash = bytes.slice(0, 21);
+    var checksum = Crypto.SHA256(Crypto.SHA256(hash, { asBytes: true }), { asBytes: true });
+
+    if (checksum[0] != bytes[21] ||
+            checksum[1] != bytes[22] ||
+            checksum[2] != bytes[23] ||
+            checksum[3] != bytes[24]) {
+        throw "Checksum validation failed!";
+    }
+
+    if (version != hash.shift()) {
+        throw "Version " + hash.shift() + " not supported!";
+    }
+
+    return hash;
+};
+//https://raw.github.com/bitcoinjs/bitcoinjs-lib/e90780d3d3b8fc0d027d2bcb38b80479902f223e/src/ecdsa.js
+Bitcoin.ECDSA = (function () {
+    var ecparams = EllipticCurve.getSECCurveByName("secp256k1");
+    var rng = new SecureRandom();
+
+    var P_OVER_FOUR = null;
+
+    function implShamirsTrick(P, k, Q, l) {
+        var m = Math.max(k.bitLength(), l.bitLength());
+        var Z = P.add2D(Q);
+        var R = P.curve.getInfinity();
+
+        for (var i = m - 1; i >= 0; --i) {
+            R = R.twice2D();
+
+            R.z = BigInteger.ONE;
+
+            if (k.testBit(i)) {
+                if (l.testBit(i)) {
+                    R = R.add2D(Z);
+                } else {
+                    R = R.add2D(P);
+                }
+            } else {
+                if (l.testBit(i)) {
+                    R = R.add2D(Q);
+                }
+            }
+        }
+
+        return R;
+    };
+
+    var ECDSA = {
+        getBigRandom: function (limit) {
+            return new BigInteger(limit.bitLength(), rng)
+                .mod(limit.subtract(BigInteger.ONE))
+                .add(BigInteger.ONE);
+        },
+        sign: function (hash, priv) {
+            var d = priv;
+            var n = ecparams.getN();
+            var e = BigInteger.fromByteArrayUnsigned(hash);
+
+            do {
+                var k = ECDSA.getBigRandom(n);
+                var G = ecparams.getG();
+                var Q = G.multiply(k);
+                var r = Q.getX().toBigInteger().mod(n);
+            } while (r.compareTo(BigInteger.ZERO) <= 0);
+
+            var s = k.modInverse(n).multiply(e.add(d.multiply(r))).mod(n);
+
+            return ECDSA.serializeSig(r, s);
+        },
+
+        verify: function (hash, sig, pubkey) {
+            var r, s;
+            if (Bitcoin.Util.isArray(sig)) {
+                var obj = ECDSA.parseSig(sig);
+                r = obj.r;
+                s = obj.s;
+            } else if ("object" === typeof sig && sig.r && sig.s) {
+                r = sig.r;
+                s = sig.s;
+            } else {
+                throw "Invalid value for signature";
             }
 
-            if (version != hash.shift()) {
-                throw "Version " + hash.shift() + " not supported!";
+            var Q;
+            if (pubkey instanceof ec.PointFp) {
+                Q = pubkey;
+            } else if (Bitcoin.Util.isArray(pubkey)) {
+                Q = EllipticCurve.PointFp.decodeFrom(ecparams.getCurve(), pubkey);
+            } else {
+                throw "Invalid format for pubkey value, must be byte array or ec.PointFp";
+            }
+            var e = BigInteger.fromByteArrayUnsigned(hash);
+
+            return ECDSA.verifyRaw(e, r, s, Q);
+        },
+
+        verifyRaw: function (e, r, s, Q) {
+            var n = ecparams.getN();
+            var G = ecparams.getG();
+
+            if (r.compareTo(BigInteger.ONE) < 0 ||
+                r.compareTo(n) >= 0)
+                return false;
+
+            if (s.compareTo(BigInteger.ONE) < 0 ||
+                s.compareTo(n) >= 0)
+                return false;
+
+            var c = s.modInverse(n);
+
+            var u1 = e.multiply(c).mod(n);
+            var u2 = r.multiply(c).mod(n);
+
+            // TODO(!!!): For some reason Shamir's trick isn't working with
+            // signed message verification!? Probably an implementation
+            // error!
+            //var point = implShamirsTrick(G, u1, Q, u2);
+            var point = G.multiply(u1).add(Q.multiply(u2));
+
+            var v = point.getX().toBigInteger().mod(n);
+
+            return v.equals(r);
+        },
+
+        /**
+        * Serialize a signature into DER format.
+        *
+        * Takes two BigIntegers representing r and s and returns a byte array.
+        */
+        serializeSig: function (r, s) {
+            var rBa = r.toByteArraySigned();
+            var sBa = s.toByteArraySigned();
+
+            var sequence = [];
+            sequence.push(0x02); // INTEGER
+            sequence.push(rBa.length);
+            sequence = sequence.concat(rBa);
+
+            sequence.push(0x02); // INTEGER
+            sequence.push(sBa.length);
+            sequence = sequence.concat(sBa);
+
+            sequence.unshift(sequence.length);
+            sequence.unshift(0x30); // SEQUENCE
+
+            return sequence;
+        },
+
+        /**
+        * Parses a byte array containing a DER-encoded signature.
+        *
+        * This function will return an object of the form:
+        *
+        * {
+        *   r: BigInteger,
+        *   s: BigInteger
+        * }
+        */
+        parseSig: function (sig) {
+            var cursor;
+            if (sig[0] != 0x30)
+                throw new Error("Signature not a valid DERSequence");
+
+            cursor = 2;
+            if (sig[cursor] != 0x02)
+                throw new Error("First element in signature must be a DERInteger");;
+            var rBa = sig.slice(cursor + 2, cursor + 2 + sig[cursor + 1]);
+
+            cursor += 2 + sig[cursor + 1];
+            if (sig[cursor] != 0x02)
+                throw new Error("Second element in signature must be a DERInteger");
+            var sBa = sig.slice(cursor + 2, cursor + 2 + sig[cursor + 1]);
+
+            cursor += 2 + sig[cursor + 1];
+
+            //if (cursor != sig.length)
+            //  throw new Error("Extra bytes in signature");
+
+            var r = BigInteger.fromByteArrayUnsigned(rBa);
+            var s = BigInteger.fromByteArrayUnsigned(sBa);
+
+            return {
+                r: r,
+                s: s
+            };
+        },
+
+        parseSigCompact: function (sig) {
+            if (sig.length !== 65) {
+                throw "Signature has the wrong length";
             }
 
-            return hash;
-        };
-        //https://raw.github.com/bitcoinjs/bitcoinjs-lib/e90780d3d3b8fc0d027d2bcb38b80479902f223e/src/ecdsa.js
-        Bitcoin.ECDSA = (function () {
-            var ecparams = EllipticCurve.getSECCurveByName("secp256k1");
-            var rng = new SecureRandom();
+            // Signature is prefixed with a type byte storing three bits of
+            // information.
+            var i = sig[0] - 27;
+            if (i < 0 || i > 7) {
+                throw "Invalid signature type";
+            }
 
-            var P_OVER_FOUR = null;
+            var n = ecparams.getN();
+            var r = BigInteger.fromByteArrayUnsigned(sig.slice(1, 33)).mod(n);
+            var s = BigInteger.fromByteArrayUnsigned(sig.slice(33, 65)).mod(n);
 
-            function implShamirsTrick(P, k, Q, l) {
-                var m = Math.max(k.bitLength(), l.bitLength());
-                var Z = P.add2D(Q);
-                var R = P.curve.getInfinity();
-
-                for (var i = m - 1; i >= 0; --i) {
-                    R = R.twice2D();
-
-                    R.z = BigInteger.ONE;
-
-                    if (k.testBit(i)) {
-                        if (l.testBit(i)) {
-                            R = R.add2D(Z);
-                        } else {
-                            R = R.add2D(P);
-                        }
-                    } else {
-                        if (l.testBit(i)) {
-                            R = R.add2D(Q);
-                        }
-                    }
-                }
-
-                return R;
+            return {
+                r: r,
+                s: s,
+                i: i
             };
-
-            var ECDSA = {
-                getBigRandom: function (limit) {
-                    return new BigInteger(limit.bitLength(), rng)
-                        .mod(limit.subtract(BigInteger.ONE))
-                        .add(BigInteger.ONE);
-                },
-                sign: function (hash, priv) {
-                    var d = priv;
-                    var n = ecparams.getN();
-                    var e = BigInteger.fromByteArrayUnsigned(hash);
-
-                    do {
-                        var k = ECDSA.getBigRandom(n);
-                        var G = ecparams.getG();
-                        var Q = G.multiply(k);
-                        var r = Q.getX().toBigInteger().mod(n);
-                    } while (r.compareTo(BigInteger.ZERO) <= 0);
-
-                    var s = k.modInverse(n).multiply(e.add(d.multiply(r))).mod(n);
-
-                    return ECDSA.serializeSig(r, s);
-                },
-
-                verify: function (hash, sig, pubkey) {
-                    var r, s;
-                    if (Bitcoin.Util.isArray(sig)) {
-                        var obj = ECDSA.parseSig(sig);
-                        r = obj.r;
-                        s = obj.s;
-                    } else if ("object" === typeof sig && sig.r && sig.s) {
-                        r = sig.r;
-                        s = sig.s;
-                    } else {
-                        throw "Invalid value for signature";
-                    }
-
-                    var Q;
-                    if (pubkey instanceof ec.PointFp) {
-                        Q = pubkey;
-                    } else if (Bitcoin.Util.isArray(pubkey)) {
-                        Q = EllipticCurve.PointFp.decodeFrom(ecparams.getCurve(), pubkey);
-                    } else {
-                        throw "Invalid format for pubkey value, must be byte array or ec.PointFp";
-                    }
-                    var e = BigInteger.fromByteArrayUnsigned(hash);
-
-                    return ECDSA.verifyRaw(e, r, s, Q);
-                },
-
-                verifyRaw: function (e, r, s, Q) {
-                    var n = ecparams.getN();
-                    var G = ecparams.getG();
-
-                    if (r.compareTo(BigInteger.ONE) < 0 ||
-                        r.compareTo(n) >= 0)
-                        return false;
-
-                    if (s.compareTo(BigInteger.ONE) < 0 ||
-                        s.compareTo(n) >= 0)
-                        return false;
-
-                    var c = s.modInverse(n);
-
-                    var u1 = e.multiply(c).mod(n);
-                    var u2 = r.multiply(c).mod(n);
-
-                    // TODO(!!!): For some reason Shamir's trick isn't working with
-                    // signed message verification!? Probably an implementation
-                    // error!
-                    //var point = implShamirsTrick(G, u1, Q, u2);
-                    var point = G.multiply(u1).add(Q.multiply(u2));
-
-                    var v = point.getX().toBigInteger().mod(n);
-
-                    return v.equals(r);
-                },
-
-                /**
-                * Serialize a signature into DER format.
-                *
-                * Takes two BigIntegers representing r and s and returns a byte array.
-                */
-                serializeSig: function (r, s) {
-                    var rBa = r.toByteArraySigned();
-                    var sBa = s.toByteArraySigned();
-
-                    var sequence = [];
-                    sequence.push(0x02); // INTEGER
-                    sequence.push(rBa.length);
-                    sequence = sequence.concat(rBa);
-
-                    sequence.push(0x02); // INTEGER
-                    sequence.push(sBa.length);
-                    sequence = sequence.concat(sBa);
-
-                    sequence.unshift(sequence.length);
-                    sequence.unshift(0x30); // SEQUENCE
-
-                    return sequence;
-                },
-
-                /**
-                * Parses a byte array containing a DER-encoded signature.
-                *
-                * This function will return an object of the form:
-                *
-                * {
-                *   r: BigInteger,
-                *   s: BigInteger
-                * }
-                */
-                parseSig: function (sig) {
-                    var cursor;
-                    if (sig[0] != 0x30)
-                        throw new Error("Signature not a valid DERSequence");
-
-                    cursor = 2;
-                    if (sig[cursor] != 0x02)
-                        throw new Error("First element in signature must be a DERInteger");;
-                    var rBa = sig.slice(cursor + 2, cursor + 2 + sig[cursor + 1]);
-
-                    cursor += 2 + sig[cursor + 1];
-                    if (sig[cursor] != 0x02)
-                        throw new Error("Second element in signature must be a DERInteger");
-                    var sBa = sig.slice(cursor + 2, cursor + 2 + sig[cursor + 1]);
-
-                    cursor += 2 + sig[cursor + 1];
-
-                    //if (cursor != sig.length)
-                    //  throw new Error("Extra bytes in signature");
-
-                    var r = BigInteger.fromByteArrayUnsigned(rBa);
-                    var s = BigInteger.fromByteArrayUnsigned(sBa);
-
-                    return {
-                        r: r,
-                        s: s
-                    };
-                },
-
-                parseSigCompact: function (sig) {
-                    if (sig.length !== 65) {
-                        throw "Signature has the wrong length";
-                    }
-
-                    // Signature is prefixed with a type byte storing three bits of
-                    // information.
-                    var i = sig[0] - 27;
-                    if (i < 0 || i > 7) {
-                        throw "Invalid signature type";
-                    }
-
-                    var n = ecparams.getN();
-                    var r = BigInteger.fromByteArrayUnsigned(sig.slice(1, 33)).mod(n);
-                    var s = BigInteger.fromByteArrayUnsigned(sig.slice(33, 65)).mod(n);
-
-                    return {
-                        r: r,
-                        s: s,
-                        i: i
-                    };
-                },
-
-                /**
-                * Recover a public key from a signature.
-                *
-                * See SEC 1: Elliptic Curve Cryptography, section 4.1.6, "Public
-                * Key Recovery Operation".
-                *
-                * http://www.secg.org/download/aid-780/sec1-v2.pdf
-                */
-                recoverPubKey: function (r, s, hash, i) {
-                    // The recovery parameter i has two bits.
-                    i = i & 3;
-
-                    // The less significant bit specifies whether the y coordinate
-                    // of the compressed point is even or not.
-                    var isYEven = i & 1;
-
-                    // The more significant bit specifies whether we should use the
-                    // first or second candidate key.
-                    var isSecondKey = i >> 1;
-
-                    var n = ecparams.getN();
-                    var G = ecparams.getG();
-                    var curve = ecparams.getCurve();
-                    var p = curve.getQ();
-                    var a = curve.getA().toBigInteger();
-                    var b = curve.getB().toBigInteger();
-
-                    // We precalculate (p + 1) / 4 where p is if the field order
-                    if (!P_OVER_FOUR) {
-                        P_OVER_FOUR = p.add(BigInteger.ONE).divide(BigInteger.valueOf(4));
-                    }
-
-                    // 1.1 Compute x
-                    var x = isSecondKey ? r.add(n) : r;
-
-                    // 1.3 Convert x to point
-                    var alpha = x.multiply(x).multiply(x).add(a.multiply(x)).add(b).mod(p);
-                    var beta = alpha.modPow(P_OVER_FOUR, p);
-
-                    var xorOdd = beta.isEven() ? (i % 2) : ((i + 1) % 2);
-                    // If beta is even, but y isn't or vice versa, then convert it,
-                    // otherwise we're done and y == beta.
-                    var y = (beta.isEven() ? !isYEven : isYEven) ? beta : p.subtract(beta);
-
-                    // 1.4 Check that nR is at infinity
-                    var R = new EllipticCurve.PointFp(curve,
-                        curve.fromBigInteger(x),
-                        curve.fromBigInteger(y));
-                    R.validate();
-
-                    // 1.5 Compute e from M
-                    var e = BigInteger.fromByteArrayUnsigned(hash);
-                    var eNeg = BigInteger.ZERO.subtract(e).mod(n);
-
-                    // 1.6 Compute Q = r^-1 (sR - eG)
-                    var rInv = r.modInverse(n);
-                    var Q = implShamirsTrick(R, s, G, eNeg).multiply(rInv);
-
-                    Q.validate();
-                    if (!ECDSA.verifyRaw(e, r, s, Q)) {
-                        throw "Pubkey recovery unsuccessful";
-                    }
-
-                    var pubKey = new Bitcoin.ECKey();
-                    pubKey.pub = Q;
-                    return pubKey;
-                },
-
-                /**
-                * Calculate pubkey extraction parameter.
-                *
-                * When extracting a pubkey from a signature, we have to
-                * distinguish four different cases. Rather than putting this
-                * burden on the verifier, Bitcoin includes a 2-bit value with the
-                * signature.
-                *
-                * This function simply tries all four cases and returns the value
-                * that resulted in a successful pubkey recovery.
-                */
-                calcPubkeyRecoveryParam: function (address, r, s, hash) {
-                    for (var i = 0; i < 4; i++) {
-                        try {
-                            var pubkey = Bitcoin.ECDSA.recoverPubKey(r, s, hash, i);
-                            if (pubkey.getBitcoinAddress().toString() == address) {
-                                return i;
-                            }
-                        } catch (e) { }
-                    }
-                    throw "Unable to find valid recovery factor";
-                }
-            };
-
-            return ECDSA;
-        })();
-        Bitcoin.KeyPool = (function () {
-            var KeyPool = function () {
-                this.keyArray = [];
-
-                this.push = function (item) {
-                    if (item == null || item.priv == null) return;
-                    var doAdd = true;
-                    // prevent duplicates from being added to the array
-                    for (var index in this.keyArray) {
-                        var currentItem = this.keyArray[index];
-                        if (currentItem != null && currentItem.priv != null && item.getBitcoinAddress() == currentItem.getBitcoinAddress()) {
-                            doAdd = false;
-                            break;
-                        }
-                    }
-                    if (doAdd) this.keyArray.push(item);
-                };
-
-                this.reset = function () {
-                    this.keyArray = [];
-                };
-
-                this.getArray = function () {
-                    // copy array
-                    return this.keyArray.slice(0);
-                };
-
-                this.setArray = function (ka) {
-                    this.keyArray = ka;
-                };
-
-                this.length = function () {
-                    return this.keyArray.length;
-                };
-
-                this.toString = function () {
-                    var keyPoolString = "# = " + this.length() + "\n";
-                    var pool = this.getArray();
-                    for (var index in pool) {
-                        var item = pool[index];
-                        if (Bitcoin.Util.hasMethods(item, 'getBitcoinAddress', 'toString')) {
-                            if (item != null) {
-                                keyPoolString += "\"" + item.getBitcoinAddress() + "\"" + ", \"" + item.toString("wif") + "\"\n";
-                            }
-                        }
-                    }
-
-                    return keyPoolString;
-                };
-
-                return this;
-            };
-
-            return new KeyPool();
-        })();
-
-        Bitcoin.Bip38Key = (function () {
-            var Bip38 = function (address, encryptedKey) {
-                this.address = address;
-                this.priv = encryptedKey;
-            };
-
-            Bip38.prototype.getBitcoinAddress = function () {
-                return this.address;
-            };
-
-            Bip38.prototype.toString = function () {
-                return this.priv;
-            };
-
-            return Bip38;
-        })();
-
-        //https://raw.github.com/pointbiz/bitcoinjs-lib/9b2f94a028a7bc9bed94e0722563e9ff1d8e8db8/src/eckey.js
-        Bitcoin.ECKey = (function () {
-            var ECDSA = Bitcoin.ECDSA;
-            var KeyPool = Bitcoin.KeyPool;
-            var ecparams = EllipticCurve.getSECCurveByName("secp256k1");
-
-            var ECKey = function (input) {
-                if (!input) {
-                    // Generate new key
-                    var n = ecparams.getN();
-                    this.priv = ECDSA.getBigRandom(n);
-                } else if (input instanceof BigInteger) {
-                    // Input is a private key value
-                    this.priv = input;
-                } else if (Bitcoin.Util.isArray(input)) {
-                    // Prepend zero byte to prevent interpretation as negative integer
-                    this.priv = BigInteger.fromByteArrayUnsigned(input);
-                } else if ("string" == typeof input) {
-                    var bytes = null;
-                    try {
-
-                        // This part is edited for FLO. FLO WIF are always compressed WIF. FLO WIF (private key) starts with R for mainnet and c for testnet.
-                        if (((floGlobals.blockchain == "FLO") && /^R[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(input)) ||
-                            ((floGlobals.blockchain == "FLO_TEST") && /^c[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(input))) {
-                            bytes = ECKey.decodeCompressedWalletImportFormat(input);
-                            this.compressed = true;
-                        } else if (ECKey.isHexFormat(input)) {
-                            bytes = Crypto.util.hexToBytes(input);
-                        }
-
-
-                        /*
-                            if (ECKey.isWalletImportFormat(input)) {
-                                bytes = ECKey.decodeWalletImportFormat(input);
-                            } else if (ECKey.isCompressedWalletImportFormat(input)) {
-                                bytes = ECKey.decodeCompressedWalletImportFormat(input);
-                                this.compressed = true;
-                            } else if (ECKey.isMiniFormat(input)) {
-                                bytes = Crypto.SHA256(input, { asBytes: true });
-                            } else if (ECKey.isHexFormat(input)) {
-                                bytes = Crypto.util.hexToBytes(input);
-                            } else if (ECKey.isBase64Format(input)) {
-                                bytes = Crypto.util.base64ToBytes(input);
-                            }
-                            */
-                    } catch (exc1) {
-                        this.setError(exc1);
-                    }
-
-                    if (ECKey.isBase6Format(input)) {
-                        this.priv = new BigInteger(input, 6);
-                    } else if (bytes == null || bytes.length != 32) {
-                        this.priv = null;
-                    } else {
-                        // Prepend zero byte to prevent interpretation as negative integer
-                        this.priv = BigInteger.fromByteArrayUnsigned(bytes);
-                    }
-                }
-
-                this.compressed = (this.compressed == undefined) ? !!ECKey.compressByDefault : this.compressed;
+        },
+
+        /**
+        * Recover a public key from a signature.
+        *
+        * See SEC 1: Elliptic Curve Cryptography, section 4.1.6, "Public
+        * Key Recovery Operation".
+        *
+        * http://www.secg.org/download/aid-780/sec1-v2.pdf
+        */
+        recoverPubKey: function (r, s, hash, i) {
+            // The recovery parameter i has two bits.
+            i = i & 3;
+
+            // The less significant bit specifies whether the y coordinate
+            // of the compressed point is even or not.
+            var isYEven = i & 1;
+
+            // The more significant bit specifies whether we should use the
+            // first or second candidate key.
+            var isSecondKey = i >> 1;
+
+            var n = ecparams.getN();
+            var G = ecparams.getG();
+            var curve = ecparams.getCurve();
+            var p = curve.getQ();
+            var a = curve.getA().toBigInteger();
+            var b = curve.getB().toBigInteger();
+
+            // We precalculate (p + 1) / 4 where p is if the field order
+            if (!P_OVER_FOUR) {
+                P_OVER_FOUR = p.add(BigInteger.ONE).divide(BigInteger.valueOf(4));
+            }
+
+            // 1.1 Compute x
+            var x = isSecondKey ? r.add(n) : r;
+
+            // 1.3 Convert x to point
+            var alpha = x.multiply(x).multiply(x).add(a.multiply(x)).add(b).mod(p);
+            var beta = alpha.modPow(P_OVER_FOUR, p);
+
+            var xorOdd = beta.isEven() ? (i % 2) : ((i + 1) % 2);
+            // If beta is even, but y isn't or vice versa, then convert it,
+            // otherwise we're done and y == beta.
+            var y = (beta.isEven() ? !isYEven : isYEven) ? beta : p.subtract(beta);
+
+            // 1.4 Check that nR is at infinity
+            var R = new EllipticCurve.PointFp(curve,
+                curve.fromBigInteger(x),
+                curve.fromBigInteger(y));
+            R.validate();
+
+            // 1.5 Compute e from M
+            var e = BigInteger.fromByteArrayUnsigned(hash);
+            var eNeg = BigInteger.ZERO.subtract(e).mod(n);
+
+            // 1.6 Compute Q = r^-1 (sR - eG)
+            var rInv = r.modInverse(n);
+            var Q = implShamirsTrick(R, s, G, eNeg).multiply(rInv);
+
+            Q.validate();
+            if (!ECDSA.verifyRaw(e, r, s, Q)) {
+                throw "Pubkey recovery unsuccessful";
+            }
+
+            var pubKey = new Bitcoin.ECKey();
+            pubKey.pub = Q;
+            return pubKey;
+        },
+
+        /**
+        * Calculate pubkey extraction parameter.
+        *
+        * When extracting a pubkey from a signature, we have to
+        * distinguish four different cases. Rather than putting this
+        * burden on the verifier, Bitcoin includes a 2-bit value with the
+        * signature.
+        *
+        * This function simply tries all four cases and returns the value
+        * that resulted in a successful pubkey recovery.
+        */
+        calcPubkeyRecoveryParam: function (address, r, s, hash) {
+            for (var i = 0; i < 4; i++) {
                 try {
-                    // check not zero
-                    if (this.priv != null && BigInteger.ZERO.compareTo(this.priv) == 0) this.setError("Error: BigInteger equal to zero.");
-                    // valid range [0x1, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364140])
-                    var hexKeyRangeLimit = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364140";
-                    var rangeLimitBytes = Crypto.util.hexToBytes(hexKeyRangeLimit);
-                    var limitBigInt = BigInteger.fromByteArrayUnsigned(rangeLimitBytes);
-                    if (this.priv != null && limitBigInt.compareTo(this.priv) < 0) this.setError("Error: BigInteger outside of curve range.")
-
-                    if (this.priv != null) {
-                        KeyPool.push(this);
+                    var pubkey = Bitcoin.ECDSA.recoverPubKey(r, s, hash, i);
+                    if (pubkey.getBitcoinAddress().toString() == address) {
+                        return i;
                     }
-                } catch (exc2) {
-                    this.setError(exc2);
+                } catch (e) {}
+            }
+            throw "Unable to find valid recovery factor";
+        }
+    };
+
+    return ECDSA;
+})();
+Bitcoin.KeyPool = (function () {
+    var KeyPool = function () {
+        this.keyArray = [];
+
+        this.push = function (item) {
+            if (item == null || item.priv == null) return;
+            var doAdd = true;
+            // prevent duplicates from being added to the array
+            for (var index in this.keyArray) {
+                var currentItem = this.keyArray[index];
+                if (currentItem != null && currentItem.priv != null && item.getBitcoinAddress() == currentItem.getBitcoinAddress()) {
+                    doAdd = false;
+                    break;
                 }
-            };
+            }
+            if (doAdd) this.keyArray.push(item);
+        };
 
-            if (floGlobals.blockchain == "FLO")
-                ECKey.privateKeyPrefix = 0xA3; //(Bitcoin mainnet 0x80    testnet 0xEF) (FLO mainnet 0xA3 163 D)
-            else if (floGlobals.blockchain == "FLO_TEST")
-                ECKey.privateKeyPrefix = 0xEF; //FLO testnet
+        this.reset = function () {
+            this.keyArray = [];
+        };
 
-            /**
-            * Whether public keys should be returned compressed by default.
-            */
-            ECKey.compressByDefault = false;
+        this.getArray = function () {
+            // copy array
+            return this.keyArray.slice(0);
+        };
 
-            /**
-            * Set whether the public key should be returned compressed or not.
-            */
-            ECKey.prototype.setError = function (err) {
-                this.error = err;
+        this.setArray = function (ka) {
+            this.keyArray = ka;
+        };
+
+        this.length = function () {
+            return this.keyArray.length;
+        };
+
+        this.toString = function () {
+            var keyPoolString = "# = " + this.length() + "\n";
+            var pool = this.getArray();
+            for (var index in pool) {
+                var item = pool[index];
+                if (Bitcoin.Util.hasMethods(item, 'getBitcoinAddress', 'toString')) {
+                    if (item != null) {
+                        keyPoolString += "\"" + item.getBitcoinAddress() + "\"" + ", \"" + item.toString("wif") + "\"\n";
+                    }
+                }
+            }
+
+            return keyPoolString;
+        };
+
+        return this;
+    };
+
+    return new KeyPool();
+})();
+
+Bitcoin.Bip38Key = (function () {
+    var Bip38 = function (address, encryptedKey) {
+        this.address = address;
+        this.priv = encryptedKey;
+    };
+
+    Bip38.prototype.getBitcoinAddress = function () {
+        return this.address;
+    };
+
+    Bip38.prototype.toString = function () {
+        return this.priv;
+    };
+
+    return Bip38;
+})();
+
+//https://raw.github.com/pointbiz/bitcoinjs-lib/9b2f94a028a7bc9bed94e0722563e9ff1d8e8db8/src/eckey.js
+Bitcoin.ECKey = (function () {
+    var ECDSA = Bitcoin.ECDSA;
+    var KeyPool = Bitcoin.KeyPool;
+    var ecparams = EllipticCurve.getSECCurveByName("secp256k1");
+
+    var ECKey = function (input) {
+        if (!input) {
+            // Generate new key
+            var n = ecparams.getN();
+            this.priv = ECDSA.getBigRandom(n);
+        } else if (input instanceof BigInteger) {
+            // Input is a private key value
+            this.priv = input;
+        } else if (Bitcoin.Util.isArray(input)) {
+            // Prepend zero byte to prevent interpretation as negative integer
+            this.priv = BigInteger.fromByteArrayUnsigned(input);
+        } else if ("string" == typeof input) {
+            var bytes = null;
+            try{
+
+            // This part is edited for FLO. FLO WIF are always compressed WIF. FLO WIF (private key) starts with R for mainnet and c for testnet.
+                if(((floGlobals.blockchain == "FLO") && /^R[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(input)) ||
+                    ((floGlobals.blockchain == "FLO_TEST") && /^c[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(input))) {
+                    bytes = ECKey.decodeCompressedWalletImportFormat(input);
+                    this.compressed = true;
+                }else if (ECKey.isHexFormat(input)) {
+                    bytes = Crypto.util.hexToBytes(input);
+                }
+
+
+            /*
+                if (ECKey.isWalletImportFormat(input)) {
+                    bytes = ECKey.decodeWalletImportFormat(input);
+                } else if (ECKey.isCompressedWalletImportFormat(input)) {
+                    bytes = ECKey.decodeCompressedWalletImportFormat(input);
+                    this.compressed = true;
+                } else if (ECKey.isMiniFormat(input)) {
+                    bytes = Crypto.SHA256(input, { asBytes: true });
+                } else if (ECKey.isHexFormat(input)) {
+                    bytes = Crypto.util.hexToBytes(input);
+                } else if (ECKey.isBase64Format(input)) {
+                    bytes = Crypto.util.base64ToBytes(input);
+                }
+                */
+            } catch (exc1) {
+                this.setError(exc1);
+            }
+
+            if (ECKey.isBase6Format(input)) {
+                this.priv = new BigInteger(input, 6);
+            } else if (bytes == null || bytes.length != 32) {
                 this.priv = null;
-                return this;
-            };
+            } else {
+                // Prepend zero byte to prevent interpretation as negative integer
+                this.priv = BigInteger.fromByteArrayUnsigned(bytes);
+            }
+        }
 
-            /**
-            * Set whether the public key should be returned compressed or not.
-            */
-            ECKey.prototype.setCompressed = function (v) {
-                this.compressed = !!v;
-                if (this.pubPoint) this.pubPoint.compressed = this.compressed;
-                return this;
-            };
+        this.compressed = (this.compressed == undefined) ? !!ECKey.compressByDefault : this.compressed;
+        try {
+            // check not zero
+            if (this.priv != null && BigInteger.ZERO.compareTo(this.priv) == 0) this.setError("Error: BigInteger equal to zero.");
+            // valid range [0x1, 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364140])
+            var hexKeyRangeLimit = "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364140";
+            var rangeLimitBytes = Crypto.util.hexToBytes(hexKeyRangeLimit);
+            var limitBigInt = BigInteger.fromByteArrayUnsigned(rangeLimitBytes);
+            if (this.priv != null && limitBigInt.compareTo(this.priv) < 0) this.setError("Error: BigInteger outside of curve range.")
 
-            /*
-            * Return public key as a byte array in DER encoding
-            */
-            ECKey.prototype.getPub = function () {
-                if (this.compressed) {
-                    if (this.pubComp) return this.pubComp;
-                    return this.pubComp = this.getPubPoint().getEncoded(1);
-                } else {
-                    if (this.pubUncomp) return this.pubUncomp;
-                    return this.pubUncomp = this.getPubPoint().getEncoded(0);
-                }
-            };
+            if (this.priv != null) {
+                KeyPool.push(this);
+            }
+        } catch (exc2) {
+            this.setError(exc2);
+        }
+    };
 
-            /**
-            * Return public point as ECPoint object.
-            */
-            ECKey.prototype.getPubPoint = function () {
-                if (!this.pubPoint) {
-                    this.pubPoint = ecparams.getG().multiply(this.priv);
-                    this.pubPoint.compressed = this.compressed;
-                }
-                return this.pubPoint;
-            };
+    if(floGlobals.blockchain == "FLO")
+        ECKey.privateKeyPrefix = 0xA3; //(Bitcoin mainnet 0x80    testnet 0xEF) (FLO mainnet 0xA3 163 D)
+    else if(floGlobals.blockchain == "FLO_TEST")
+        ECKey.privateKeyPrefix = 0xEF; //FLO testnet
 
-            ECKey.prototype.getPubKeyHex = function () {
-                if (this.compressed) {
-                    if (this.pubKeyHexComp) return this.pubKeyHexComp;
-                    return this.pubKeyHexComp = Crypto.util.bytesToHex(this.getPub()).toString().toUpperCase();
-                } else {
-                    if (this.pubKeyHexUncomp) return this.pubKeyHexUncomp;
-                    return this.pubKeyHexUncomp = Crypto.util.bytesToHex(this.getPub()).toString().toUpperCase();
-                }
-            };
+    /**
+    * Whether public keys should be returned compressed by default.
+    */
+    ECKey.compressByDefault = false;
 
-            /**
-            * Get the pubKeyHash for this key.
-            *
-            * This is calculated as RIPE160(SHA256([encoded pubkey])) and returned as
-            * a byte array.
-            */
-            ECKey.prototype.getPubKeyHash = function () {
-                if (this.compressed) {
-                    if (this.pubKeyHashComp) return this.pubKeyHashComp;
-                    return this.pubKeyHashComp = Bitcoin.Util.sha256ripe160(this.getPub());
-                } else {
-                    if (this.pubKeyHashUncomp) return this.pubKeyHashUncomp;
-                    return this.pubKeyHashUncomp = Bitcoin.Util.sha256ripe160(this.getPub());
-                }
-            };
+    /**
+    * Set whether the public key should be returned compressed or not.
+    */
+    ECKey.prototype.setError = function (err) {
+        this.error = err;
+        this.priv = null;
+        return this;
+    };
 
-            ECKey.prototype.getBitcoinAddress = function () {
-                var hash = this.getPubKeyHash();
-                var addr = new Bitcoin.Address(hash);
-                return addr.toString();
-            };
+    /**
+    * Set whether the public key should be returned compressed or not.
+    */
+    ECKey.prototype.setCompressed = function (v) {
+        this.compressed = !!v;
+        if (this.pubPoint) this.pubPoint.compressed = this.compressed;
+        return this;
+    };
 
-            /*
-            * Takes a public point as a hex string or byte array
-            */
-            ECKey.prototype.setPub = function (pub) {
-                // byte array
-                if (Bitcoin.Util.isArray(pub)) {
-                    pub = Crypto.util.bytesToHex(pub).toString().toUpperCase();
-                }
-                var ecPoint = ecparams.getCurve().decodePointHex(pub);
-                this.setCompressed(ecPoint.compressed);
-                this.pubPoint = ecPoint;
-                return this;
-            };
+    /*
+    * Return public key as a byte array in DER encoding
+    */
+    ECKey.prototype.getPub = function () {
+        if (this.compressed) {
+            if (this.pubComp) return this.pubComp;
+            return this.pubComp = this.getPubPoint().getEncoded(1);
+        } else {
+            if (this.pubUncomp) return this.pubUncomp;
+            return this.pubUncomp = this.getPubPoint().getEncoded(0);
+        }
+    };
 
-            // Sipa Private Key Wallet Import Format
-            ECKey.prototype.getBitcoinWalletImportFormat = function () {
-                var bytes = this.getBitcoinPrivateKeyByteArray();
-                if (bytes == null) return "";
-                bytes.unshift(ECKey.privateKeyPrefix); // prepend 0x80 byte
-                if (this.compressed) bytes.push(0x01); // append 0x01 byte for compressed format
-                var checksum = Crypto.SHA256(Crypto.SHA256(bytes, { asBytes: true }), { asBytes: true });
-                bytes = bytes.concat(checksum.slice(0, 4));
-                var privWif = Bitcoin.Base58.encode(bytes);
-                return privWif;
-            };
+    /**
+    * Return public point as ECPoint object.
+    */
+    ECKey.prototype.getPubPoint = function () {
+        if (!this.pubPoint) {
+            this.pubPoint = ecparams.getG().multiply(this.priv);
+            this.pubPoint.compressed = this.compressed;
+        }
+        return this.pubPoint;
+    };
 
-            // Private Key Hex Format
-            ECKey.prototype.getBitcoinHexFormat = function () {
-                return Crypto.util.bytesToHex(this.getBitcoinPrivateKeyByteArray()).toString().toUpperCase();
-            };
+    ECKey.prototype.getPubKeyHex = function () {
+        if (this.compressed) {
+            if (this.pubKeyHexComp) return this.pubKeyHexComp;
+            return this.pubKeyHexComp = Crypto.util.bytesToHex(this.getPub()).toString().toUpperCase();
+        } else {
+            if (this.pubKeyHexUncomp) return this.pubKeyHexUncomp;
+            return this.pubKeyHexUncomp = Crypto.util.bytesToHex(this.getPub()).toString().toUpperCase();
+        }
+    };
 
-            // Private Key Base64 Format
-            ECKey.prototype.getBitcoinBase64Format = function () {
-                return Crypto.util.bytesToBase64(this.getBitcoinPrivateKeyByteArray());
-            };
+    /**
+    * Get the pubKeyHash for this key.
+    *
+    * This is calculated as RIPE160(SHA256([encoded pubkey])) and returned as
+    * a byte array.
+    */
+    ECKey.prototype.getPubKeyHash = function () {
+        if (this.compressed) {
+            if (this.pubKeyHashComp) return this.pubKeyHashComp;
+            return this.pubKeyHashComp = Bitcoin.Util.sha256ripe160(this.getPub());
+        } else {
+            if (this.pubKeyHashUncomp) return this.pubKeyHashUncomp;
+            return this.pubKeyHashUncomp = Bitcoin.Util.sha256ripe160(this.getPub());
+        }
+    };
 
-            ECKey.prototype.getBitcoinPrivateKeyByteArray = function () {
-                if (this.priv == null) return null;
-                // Get a copy of private key as a byte array
-                var bytes = this.priv.toByteArrayUnsigned();
-                // zero pad if private key is less than 32 bytes
-                while (bytes.length < 32) bytes.unshift(0x00);
-                return bytes;
-            };
+    ECKey.prototype.getBitcoinAddress = function () {
+        var hash = this.getPubKeyHash();
+        var addr = new Bitcoin.Address(hash);
+        return addr.toString();
+    };
 
-            ECKey.prototype.toString = function (format) {
-                format = format || "";
-                if (format.toString().toLowerCase() == "base64" || format.toString().toLowerCase() == "b64") {
-                    return this.getBitcoinBase64Format();
-                }
-                // Wallet Import Format
-                else if (format.toString().toLowerCase() == "wif") {
-                    return this.getBitcoinWalletImportFormat();
-                }
-                else {
-                    return this.getBitcoinHexFormat();
-                }
-            };
+    /*
+    * Takes a public point as a hex string or byte array
+    */
+    ECKey.prototype.setPub = function (pub) {
+        // byte array
+        if (Bitcoin.Util.isArray(pub)) {
+            pub = Crypto.util.bytesToHex(pub).toString().toUpperCase();
+        }
+        var ecPoint = ecparams.getCurve().decodePointHex(pub);
+        this.setCompressed(ecPoint.compressed);
+        this.pubPoint = ecPoint;
+        return this;
+    };
 
-            ECKey.prototype.sign = function (hash) {
-                return ECDSA.sign(hash, this.priv);
-            };
+    // Sipa Private Key Wallet Import Format
+    ECKey.prototype.getBitcoinWalletImportFormat = function () {
+        var bytes = this.getBitcoinPrivateKeyByteArray();
+        if (bytes == null) return "";
+        bytes.unshift(ECKey.privateKeyPrefix); // prepend 0x80 byte
+        if (this.compressed) bytes.push(0x01); // append 0x01 byte for compressed format
+        var checksum = Crypto.SHA256(Crypto.SHA256(bytes, { asBytes: true }), { asBytes: true });
+        bytes = bytes.concat(checksum.slice(0, 4));
+        var privWif = Bitcoin.Base58.encode(bytes);
+        return privWif;
+    };
 
-            ECKey.prototype.verify = function (hash, sig) {
-                return ECDSA.verify(hash, sig, this.getPub());
-            };
+    // Private Key Hex Format
+    ECKey.prototype.getBitcoinHexFormat = function () {
+        return Crypto.util.bytesToHex(this.getBitcoinPrivateKeyByteArray()).toString().toUpperCase();
+    };
 
-            /**
-            * Parse a wallet import format private key contained in a string.
-            */
-            ECKey.decodeWalletImportFormat = function (privStr) {
-                var bytes = Bitcoin.Base58.decode(privStr);
-                var hash = bytes.slice(0, 33);
-                var checksum = Crypto.SHA256(Crypto.SHA256(hash, { asBytes: true }), { asBytes: true });
-                if (checksum[0] != bytes[33] ||
+    // Private Key Base64 Format
+    ECKey.prototype.getBitcoinBase64Format = function () {
+        return Crypto.util.bytesToBase64(this.getBitcoinPrivateKeyByteArray());
+    };
+
+    ECKey.prototype.getBitcoinPrivateKeyByteArray = function () {
+        if (this.priv == null) return null;
+        // Get a copy of private key as a byte array
+        var bytes = this.priv.toByteArrayUnsigned();
+        // zero pad if private key is less than 32 bytes
+        while (bytes.length < 32) bytes.unshift(0x00);
+        return bytes;
+    };
+
+    ECKey.prototype.toString = function (format) {
+        format = format || "";
+        if (format.toString().toLowerCase() == "base64" || format.toString().toLowerCase() == "b64") {
+            return this.getBitcoinBase64Format();
+        }
+        // Wallet Import Format
+        else if (format.toString().toLowerCase() == "wif") {
+            return this.getBitcoinWalletImportFormat();
+        }
+        else {
+            return this.getBitcoinHexFormat();
+        }
+    };
+
+    ECKey.prototype.sign = function (hash) {
+        return ECDSA.sign(hash, this.priv);
+    };
+
+    ECKey.prototype.verify = function (hash, sig) {
+        return ECDSA.verify(hash, sig, this.getPub());
+    };
+
+    /**
+    * Parse a wallet import format private key contained in a string.
+    */
+    ECKey.decodeWalletImportFormat = function (privStr) {
+        var bytes = Bitcoin.Base58.decode(privStr);
+        var hash = bytes.slice(0, 33);
+        var checksum = Crypto.SHA256(Crypto.SHA256(hash, { asBytes: true }), { asBytes: true });
+        if (checksum[0] != bytes[33] ||
                     checksum[1] != bytes[34] ||
                     checksum[2] != bytes[35] ||
                     checksum[3] != bytes[36]) {
-                    throw "Checksum validation failed!";
+            throw "Checksum validation failed!";
 
-                }
-                var version = hash.shift();
-                if (version != ECKey.privateKeyPrefix) {
-                    throw "Version " + version + " not supported!";
-                }
-                return hash;
-            };
+        }
+        var version = hash.shift();
+        if (version != ECKey.privateKeyPrefix) {
+            throw "Version " + version + " not supported!";
+        }
+        return hash;
+    };
 
-            /**
-            * Parse a compressed wallet import format private key contained in a string.
-            */
-            ECKey.decodeCompressedWalletImportFormat = function (privStr) {
-                var bytes = Bitcoin.Base58.decode(privStr);
-                var hash = bytes.slice(0, 34);
-                var checksum = Crypto.SHA256(Crypto.SHA256(hash, { asBytes: true }), { asBytes: true });
-                if (checksum[0] != bytes[34] ||
+    /**
+    * Parse a compressed wallet import format private key contained in a string.
+    */
+    ECKey.decodeCompressedWalletImportFormat = function (privStr) {
+        var bytes = Bitcoin.Base58.decode(privStr);
+        var hash = bytes.slice(0, 34);
+        var checksum = Crypto.SHA256(Crypto.SHA256(hash, { asBytes: true }), { asBytes: true });
+        if (checksum[0] != bytes[34] ||
                     checksum[1] != bytes[35] ||
                     checksum[2] != bytes[36] ||
                     checksum[3] != bytes[37]) {
-                    throw "Checksum validation failed!";
-                }
-                var version = hash.shift();
-                if (version != ECKey.privateKeyPrefix) {
-                    throw "Version " + version + " not supported!";
-                }
-                hash.pop();
-                return hash;
-            };
+            throw "Checksum validation failed!";
+        }
+        var version = hash.shift();
+        if (version != ECKey.privateKeyPrefix) {
+            throw "Version " + version + " not supported!";
+        }
+        hash.pop();
+        return hash;
+    };
 
-            // 64 characters [0-9A-F]
-            ECKey.isHexFormat = function (key) {
-                key = key.toString();
-                return /^[A-Fa-f0-9]{64}$/.test(key);
-            };
+    // 64 characters [0-9A-F]
+    ECKey.isHexFormat = function (key) {
+        key = key.toString();
+        return /^[A-Fa-f0-9]{64}$/.test(key);
+    };
 
-            // 51 characters base58, always starts with a '5'
-            ECKey.isWalletImportFormat = function (key) {
-                key = key.toString();
-                return (ECKey.privateKeyPrefix == 0x80) ?
-                    (/^5[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{50}$/.test(key)) :
-                    (/^R[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{50}$/.test(key));
-            };
+    // 51 characters base58, always starts with a '5'
+    ECKey.isWalletImportFormat = function (key) {
+        key = key.toString();
+        return (ECKey.privateKeyPrefix == 0x80) ?
+                            (/^5[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{50}$/.test(key)) :
+                            (/^R[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{50}$/.test(key));
+    };
 
-            // 52 characters base58
-            ECKey.isCompressedWalletImportFormat = function (key) {
-                key = key.toString();
-                return (ECKey.privateKeyPrefix == 0x80) ?
-                    (/^[LK][123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(key)) :
-                    (/^R[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(key));
-            };
+    // 52 characters base58
+    ECKey.isCompressedWalletImportFormat = function (key) {
+        key = key.toString();
+        return (ECKey.privateKeyPrefix == 0x80) ?
+                            (/^[LK][123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(key)) :
+                            (/^R[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{51}$/.test(key));
+    };
 
-            // 44 characters
-            ECKey.isBase64Format = function (key) {
-                key = key.toString();
-                return (/^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789=+\/]{44}$/.test(key));
-            };
+    // 44 characters
+    ECKey.isBase64Format = function (key) {
+        key = key.toString();
+        return (/^[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789=+\/]{44}$/.test(key));
+    };
 
-            // 99 characters, 1=1, if using dice convert 6 to 0
-            ECKey.isBase6Format = function (key) {
-                key = key.toString();
-                return (/^[012345]{99}$/.test(key));
-            };
+    // 99 characters, 1=1, if using dice convert 6 to 0
+    ECKey.isBase6Format = function (key) {
+        key = key.toString();
+        return (/^[012345]{99}$/.test(key));
+    };
 
-            // 22, 26 or 30 characters, always starts with an 'S'
-            ECKey.isMiniFormat = function (key) {
-                key = key.toString();
-                var validChars22 = /^S[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{21}$/.test(key);
-                var validChars26 = /^S[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{25}$/.test(key);
-                var validChars30 = /^S[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{29}$/.test(key);
-                var testBytes = Crypto.SHA256(key + "?", { asBytes: true });
+    // 22, 26 or 30 characters, always starts with an 'S'
+    ECKey.isMiniFormat = function (key) {
+        key = key.toString();
+        var validChars22 = /^S[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{21}$/.test(key);
+        var validChars26 = /^S[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{25}$/.test(key);
+        var validChars30 = /^S[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{29}$/.test(key);
+        var testBytes = Crypto.SHA256(key + "?", { asBytes: true });
 
-                return ((testBytes[0] === 0x00 || testBytes[0] === 0x01) && (validChars22 || validChars26 || validChars30));
-            };
+        return ((testBytes[0] === 0x00 || testBytes[0] === 0x01) && (validChars22 || validChars26 || validChars30));
+    };
 
-            return ECKey;
-        })();
-        //https://raw.github.com/bitcoinjs/bitcoinjs-lib/09e8c6e184d6501a0c2c59d73ca64db5c0d3eb95/src/util.js
-        // Bitcoin utility functions
-        Bitcoin.Util = {
-            /**
-            * Cross-browser compatibility version of Array.isArray.
-            */
-            isArray: Array.isArray || function (o) {
-                return Object.prototype.toString.call(o) === '[object Array]';
-            },
-            /**
-            * Create an array of a certain length filled with a specific value.
-            */
-            makeFilledArray: function (len, val) {
-                var array = [];
-                var i = 0;
-                while (i < len) {
-                    array[i++] = val;
-                }
-                return array;
-            },
-            /**
-            * Turn an integer into a "var_int".
-            *
-            * "var_int" is a variable length integer used by Bitcoin's binary format.
-            *
-            * Returns a byte array.
-            */
-            numToVarInt: function (i) {
-                if (i < 0xfd) {
-                    // unsigned char
-                    return [i];
-                } else if (i <= 1 << 16) {
-                    // unsigned short (LE)
-                    return [0xfd, i >>> 8, i & 255];
-                } else if (i <= 1 << 32) {
-                    // unsigned int (LE)
-                    return [0xfe].concat(Crypto.util.wordsToBytes([i]));
-                } else {
-                    // unsigned long long (LE)
-                    return [0xff].concat(Crypto.util.wordsToBytes([i >>> 32, i]));
-                }
-            },
-            /**
-            * Parse a Bitcoin value byte array, returning a BigInteger.
-            */
-            valueToBigInt: function (valueBuffer) {
-                if (valueBuffer instanceof BigInteger) return valueBuffer;
+    return ECKey;
+})();
+//https://raw.github.com/bitcoinjs/bitcoinjs-lib/09e8c6e184d6501a0c2c59d73ca64db5c0d3eb95/src/util.js
+// Bitcoin utility functions
+Bitcoin.Util = {
+    /**
+    * Cross-browser compatibility version of Array.isArray.
+    */
+    isArray: Array.isArray || function (o) {
+        return Object.prototype.toString.call(o) === '[object Array]';
+    },
+    /**
+    * Create an array of a certain length filled with a specific value.
+    */
+    makeFilledArray: function (len, val) {
+        var array = [];
+        var i = 0;
+        while (i < len) {
+            array[i++] = val;
+        }
+        return array;
+    },
+    /**
+    * Turn an integer into a "var_int".
+    *
+    * "var_int" is a variable length integer used by Bitcoin's binary format.
+    *
+    * Returns a byte array.
+    */
+    numToVarInt: function (i) {
+        if (i < 0xfd) {
+            // unsigned char
+            return [i];
+        } else if (i <= 1 << 16) {
+            // unsigned short (LE)
+            return [0xfd, i >>> 8, i & 255];
+        } else if (i <= 1 << 32) {
+            // unsigned int (LE)
+            return [0xfe].concat(Crypto.util.wordsToBytes([i]));
+        } else {
+            // unsigned long long (LE)
+            return [0xff].concat(Crypto.util.wordsToBytes([i >>> 32, i]));
+        }
+    },
+    /**
+    * Parse a Bitcoin value byte array, returning a BigInteger.
+    */
+    valueToBigInt: function (valueBuffer) {
+        if (valueBuffer instanceof BigInteger) return valueBuffer;
 
-                // Prepend zero byte to prevent interpretation as negative integer
-                return BigInteger.fromByteArrayUnsigned(valueBuffer);
-            },
-            /**
-            * Format a Bitcoin value as a string.
-            *
-            * Takes a BigInteger or byte-array and returns that amount of Bitcoins in a
-            * nice standard formatting.
-            *
-            * Examples:
-            * 12.3555
-            * 0.1234
-            * 900.99998888
-            * 34.00
-            */
-            formatValue: function (valueBuffer) {
-                var value = this.valueToBigInt(valueBuffer).toString();
-                var integerPart = value.length > 8 ? value.substr(0, value.length - 8) : '0';
-                var decimalPart = value.length > 8 ? value.substr(value.length - 8) : value;
-                while (decimalPart.length < 8) decimalPart = "0" + decimalPart;
-                decimalPart = decimalPart.replace(/0*$/, '');
-                while (decimalPart.length < 2) decimalPart += "0";
-                return integerPart + "." + decimalPart;
-            },
-            /**
-            * Parse a floating point string as a Bitcoin value.
-            *
-            * Keep in mind that parsing user input is messy. You should always display
-            * the parsed value back to the user to make sure we understood his input
-            * correctly.
-            */
-            parseValue: function (valueString) {
-                // TODO: Detect other number formats (e.g. comma as decimal separator)
-                var valueComp = valueString.split('.');
-                var integralPart = valueComp[0];
-                var fractionalPart = valueComp[1] || "0";
-                while (fractionalPart.length < 8) fractionalPart += "0";
-                fractionalPart = fractionalPart.replace(/^0+/g, '');
-                var value = BigInteger.valueOf(parseInt(integralPart));
-                value = value.multiply(BigInteger.valueOf(100000000));
-                value = value.add(BigInteger.valueOf(parseInt(fractionalPart)));
-                return value;
-            },
-            /**
-            * Calculate RIPEMD160(SHA256(data)).
-            *
-            * Takes an arbitrary byte array as inputs and returns the hash as a byte
-            * array.
-            */
-            sha256ripe160: function (data) {
-                return ripemd160(Crypto.SHA256(data, { asBytes: true }), { asBytes: true });
-            },
-            // double sha256
-            dsha256: function (data) {
-                return Crypto.SHA256(Crypto.SHA256(data, { asBytes: true }), { asBytes: true });
-            },
-            // duck typing method
-            hasMethods: function (obj /*, method list as strings */) {
-                var i = 1, methodName;
-                while ((methodName = arguments[i++])) {
-                    if (typeof obj[methodName] != 'function') {
-                        return false;
-                    }
-                }
-                return true;
+        // Prepend zero byte to prevent interpretation as negative integer
+        return BigInteger.fromByteArrayUnsigned(valueBuffer);
+    },
+    /**
+    * Format a Bitcoin value as a string.
+    *
+    * Takes a BigInteger or byte-array and returns that amount of Bitcoins in a
+    * nice standard formatting.
+    *
+    * Examples:
+    * 12.3555
+    * 0.1234
+    * 900.99998888
+    * 34.00
+    */
+    formatValue: function (valueBuffer) {
+        var value = this.valueToBigInt(valueBuffer).toString();
+        var integerPart = value.length > 8 ? value.substr(0, value.length - 8) : '0';
+        var decimalPart = value.length > 8 ? value.substr(value.length - 8) : value;
+        while (decimalPart.length < 8) decimalPart = "0" + decimalPart;
+        decimalPart = decimalPart.replace(/0*$/, '');
+        while (decimalPart.length < 2) decimalPart += "0";
+        return integerPart + "." + decimalPart;
+    },
+    /**
+    * Parse a floating point string as a Bitcoin value.
+    *
+    * Keep in mind that parsing user input is messy. You should always display
+    * the parsed value back to the user to make sure we understood his input
+    * correctly.
+    */
+    parseValue: function (valueString) {
+        // TODO: Detect other number formats (e.g. comma as decimal separator)
+        var valueComp = valueString.split('.');
+        var integralPart = valueComp[0];
+        var fractionalPart = valueComp[1] || "0";
+        while (fractionalPart.length < 8) fractionalPart += "0";
+        fractionalPart = fractionalPart.replace(/^0+/g, '');
+        var value = BigInteger.valueOf(parseInt(integralPart));
+        value = value.multiply(BigInteger.valueOf(100000000));
+        value = value.add(BigInteger.valueOf(parseInt(fractionalPart)));
+        return value;
+    },
+    /**
+    * Calculate RIPEMD160(SHA256(data)).
+    *
+    * Takes an arbitrary byte array as inputs and returns the hash as a byte
+    * array.
+    */
+    sha256ripe160: function (data) {
+        return ripemd160(Crypto.SHA256(data, { asBytes: true }), { asBytes: true });
+    },
+    // double sha256
+    dsha256: function (data) {
+        return Crypto.SHA256(Crypto.SHA256(data, { asBytes: true }), { asBytes: true });
+    },
+    // duck typing method
+    hasMethods: function(obj /*, method list as strings */){
+        var i = 1, methodName;
+        while((methodName = arguments[i++])){
+            if(typeof obj[methodName] != 'function') {
+                return false;
             }
-        };
+        }
+        return true;
+    }
+};
 
 
-        (function (ellipticCurveType) {
+    (function (ellipticCurveType) {
 
             //Defining Elliptic Encryption Object  
-            var ellipticEncryption = window.ellipticCurveEncryption = function () { };
+            var ellipticEncryption = window.ellipticCurveEncryption = function () {};
 
             ellipticEncryption.rng = new SecureRandom();
 
@@ -6304,8 +6306,8 @@
         })("secp256k1");
 
 
-        // secrets.js - by Alexander Stetsyuk - released under MIT License
-        (function (exports, global) {
+    // secrets.js - by Alexander Stetsyuk - released under MIT License
+    (function (exports, global) {
             var defaults = {
                 bits: 8, // default number of bits
                 radix: 16, // work with HEX by default
@@ -6339,7 +6341,7 @@
 
             function init(bits) {
                 if (bits && (typeof bits !== 'number' || bits % 1 !== 0 || bits < defaults.minBits || bits >
-                    defaults.maxBits)) {
+                        defaults.maxBits)) {
                     throw new Error('Number of bits must be an integer between ' + defaults.minBits + ' and ' +
                         defaults.maxBits + ', inclusive.')
                 }
@@ -6402,7 +6404,7 @@
 
                 // node.js crypto.randomBytes()
                 if (typeof require === 'function' && (crypto = require('crypto')) && (randomBits = crypto[
-                    'randomBytes'])) {
+                        'randomBytes'])) {
                     return function (bits) {
                         var bytes = Math.ceil(bits / 8),
                             str = null;
@@ -6416,7 +6418,7 @@
 
                 // browsers with window.crypto.getRandomValues()
                 if (global['crypto'] && typeof global['crypto']['getRandomValues'] === 'function' && typeof global[
-                    'Uint32Array'] === 'function') {
+                        'Uint32Array'] === 'function') {
                     crypto = global['crypto'];
                     return function (bits) {
                         var elems = Math.ceil(bits / 32),
@@ -6473,7 +6475,7 @@
 
                 // test the RNG (5 times)
                 if (typeof rng !== 'function' || typeof rng(config.bits) !== 'string' || !parseInt(rng(config.bits),
-                    2) || rng(config.bits).length > config.bits || rng(config.bits).length < config.bits) {
+                        2) || rng(config.bits).length > config.bits || rng(config.bits).length < config.bits) {
                     throw new Error(
                         "Random number generator is invalid. Supply an RNG of the form function(bits){} that returns a string containing 'bits' number of random 1's and 0's."
                     )
@@ -6629,7 +6631,7 @@
 
                 var bits = parseInt(share[0], 36);
                 if (bits && (typeof bits !== 'number' || bits % 1 !== 0 || bits < defaults.minBits || bits >
-                    defaults.maxBits)) {
+                        defaults.maxBits)) {
                     throw new Error('Number of bits must be an integer between ' + defaults.minBits + ' and ' +
                         defaults.maxBits + ', inclusive.')
                 }
@@ -6750,7 +6752,7 @@
                             product = -1; // fix for a zero product term, after which the sum should be sum^0 = sum, not sum^1
                             break;
                         }
-                        product = (product + config.logs[at ^ x[j]] - config.logs[x[i] ^ x[j]] + config.max /* to make sure it's not negative */) %
+                        product = (product + config.logs[at ^ x[j]] - config.logs[x[i] ^ x[j]] + config.max /* to make sure it's not negative */ ) %
                             config.max;
                     }
 
@@ -6878,652 +6880,673 @@
             typeof global !== 'undefined' ? global : window);
 
         //For diff base
-        /*
-        Functions available:
-        diff(originalObj, updatedObj) returns the difference of the original and updated objects
-        addedDiff(original, updatedObj) returns only the values added to the updated object
-        deletedDiff(original, updatedObj) returns only the values deleted in the updated object
-        updatedDiff(original, updatedObj) returns only the values that have been changed in the updated object
-        findDiff(original, updatedObj) returns an object with the added, deleted and updated differences  
-        mergeRecursive(original, diff) returns a new object that will merge difference to old object
-        mergeDiff(original, allDiff) returns a new object from original object merged with all differences (allDiff is returned object of findDiff)
-        */
-        (function () {
-            const isDate = d => d instanceof Date;
-            const isEmpty = o => Object.keys(o).length === 0;
-            const isObject = o => o != null && typeof o === 'object';
-            const properObject = o => isObject(o) && !o.hasOwnProperty ? { ...o } : o;
-            const getLargerArray = (l, r) => l.length > r.length ? l : r;
+    /*
+    Functions available:
+    diff(originalObj, updatedObj) returns the difference of the original and updated objects
+    addedDiff(original, updatedObj) returns only the values added to the updated object
+    deletedDiff(original, updatedObj) returns only the values deleted in the updated object
+    updatedDiff(original, updatedObj) returns only the values that have been changed in the updated object
+    findDiff(original, updatedObj) returns an object with the added, deleted and updated differences  
+    mergeRecursive(original, diff) returns a new object that will merge difference to old object
+    mergeDiff(original, allDiff) returns a new object from original object merged with all differences (allDiff is returned object of findDiff)
+    */
+(function(){
+    const isDate = d => d instanceof Date;
+    const isEmpty = o => Object.keys(o).length === 0;
+    const isObject = o => o != null && typeof o === 'object';
+    const properObject = o => isObject(o) && !o.hasOwnProperty ? { ...o } : o;    
+    const getLargerArray = (l, r) => l.length > r.length ? l : r;
 
-            const preserve = (diff, left, right) => {
-                if (!isObject(diff)) return diff;
-                return Object.keys(diff).reduce((acc, key) => {
-                    const leftArray = left[key];
-                    const rightArray = right[key];
-                    if (Array.isArray(leftArray) && Array.isArray(rightArray)) {
-                        const array = [...getLargerArray(leftArray, rightArray)];
-                        return {
-                            ...acc,
-                            [key]: array.reduce((acc2, item, index) => {
-                                if (diff[key].hasOwnProperty(index)) {
-                                    acc2[index] = preserve(diff[key][index], leftArray[index], rightArray[index]); // diff recurse and check for nested arrays
-                                    return acc2;
-                                }
-                                delete acc2[index]; // no diff aka empty
-                                return acc2;
-                            }, array)
-                        };
-                    }
-                    return {
-                        ...acc,
-                        [key]: diff[key]
-                    };
-                }, {});
-            };
-
-            const updatedDiff = (lhs, rhs) => {
-                if (lhs === rhs) return {};
-                if (!isObject(lhs) || !isObject(rhs)) return rhs;
-                const l = properObject(lhs);
-                const r = properObject(rhs);
-                if (isDate(l) || isDate(r)) {
-                    if (l.valueOf() == r.valueOf()) return {};
-                    return r;
-                }
-                return Object.keys(r).reduce((acc, key) => {
-                    if (l.hasOwnProperty(key)) {
-                        const difference = updatedDiff(l[key], r[key]);
-                        if (isObject(difference) && isEmpty(difference) && !isDate(difference)) return acc;
-                        return { ...acc, [key]: difference };
-                    }
-                    return acc;
-                }, {});
-            };
-
-
-            const diff = (lhs, rhs) => {
-                if (lhs === rhs) return {}; // equal return no diff
-                if (!isObject(lhs) || !isObject(rhs)) return rhs; // return updated rhs
-                const l = properObject(lhs);
-                const r = properObject(rhs);
-                const deletedValues = Object.keys(l).reduce((acc, key) => {
-                    return r.hasOwnProperty(key) ? acc : { ...acc, [key]: null };
-                }, {});
-                if (isDate(l) || isDate(r)) {
-                    if (l.valueOf() == r.valueOf()) return {};
-                    return r;
-                }
-                return Object.keys(r).reduce((acc, key) => {
-                    if (!l.hasOwnProperty(key)) return { ...acc, [key]: r[key] }; // return added r key
-                    const difference = diff(l[key], r[key]);
-                    if (isObject(difference) && isEmpty(difference) && !isDate(difference)) return acc; // return no diff
-                    return { ...acc, [key]: difference }; // return updated key
-                }, deletedValues);
-            };
-
-            const addedDiff = (lhs, rhs) => {
-                if (lhs === rhs || !isObject(lhs) || !isObject(rhs)) return {};
-                const l = properObject(lhs);
-                const r = properObject(rhs);
-                return Object.keys(r).reduce((acc, key) => {
-                    if (l.hasOwnProperty(key)) {
-                        const difference = addedDiff(l[key], r[key]);
-                        if (isObject(difference) && isEmpty(difference)) return acc;
-                        return { ...acc, [key]: difference };
-                    }
-                    return { ...acc, [key]: r[key] };
-                }, {});
-            };
-
-            const arrayDiff = (lhs, rhs) => {
-                if (lhs === rhs) return {}; // equal return no diff
-                if (!isObject(lhs) || !isObject(rhs)) return rhs; // return updated rhs
-                const l = properObject(lhs);
-                const r = properObject(rhs);
-                const deletedValues = Object.keys(l).reduce((acc, key) => {
-                    return r.hasOwnProperty(key) ? acc : { ...acc, [key]: null };
-                }, {});
-                if (isDate(l) || isDate(r)) {
-                    if (l.valueOf() == r.valueOf()) return {};
-                    return r;
-                }
-                if (Array.isArray(r) && Array.isArray(l)) {
-                    const deletedValues = l.reduce((acc, item, index) => {
-                        return r.hasOwnProperty(index) ? acc.concat(item) : acc.concat(null);
-                    }, []);
-                    return r.reduce((acc, rightItem, index) => {
-                        if (!deletedValues.hasOwnProperty(index)) {
-                            return acc.concat(rightItem);
-                        }
-                        const leftItem = l[index];
-                        const difference = diff(rightItem, leftItem);
-                        if (isObject(difference) && isEmpty(difference) && !isDate(difference)) {
-                            delete acc[index];
-                            return acc; // return no diff
-                        }
-                        return acc.slice(0, index).concat(rightItem).concat(acc.slice(index + 1)); // return updated key
-                    }, deletedValues);
-                }
-
-                return Object.keys(r).reduce((acc, key) => {
-                    if (!l.hasOwnProperty(key)) return { ...acc, [key]: r[key] }; // return added r key
-                    const difference = diff(l[key], r[key]);
-                    if (isObject(difference) && isEmpty(difference) && !isDate(difference)) return acc; // return no diff
-                    return { ...acc, [key]: difference }; // return updated key
-                }, deletedValues);
-            };
-
-            const deletedDiff = (lhs, rhs) => {
-                if (lhs === rhs || !isObject(lhs) || !isObject(rhs)) return {};
-                const l = properObject(lhs);
-                const r = properObject(rhs);
-                return Object.keys(l).reduce((acc, key) => {
-                    if (r.hasOwnProperty(key)) {
-                        const difference = deletedDiff(l[key], r[key]);
-                        if (isObject(difference) && isEmpty(difference)) return acc;
-                        return { ...acc, [key]: difference };
-                    }
-                    return { ...acc, [key]: null };
-                }, {});
-            };
-            window.findDiff = (lhs, rhs) => ({
-                added: addedDiff(lhs, rhs),
-                deleted: deletedDiff(lhs, rhs),
-                updated: updatedDiff(lhs, rhs),
-            });
-
-            const mergeRecursive = (obj1, obj2) => {
-                for (var p in obj2) {
-                    try {
-                        if (obj2[p].constructor == Object)
-                            obj1[p] = mergeRecursive(obj1[p], obj2[p]);
-                        // Property in destination object set; update its value.
-                        else if (Ext.isArray(obj2[p])) {
-                            // obj1[p] = [];
-                            if (obj2[p].length < 1)
-                                obj1[p] = obj2[p];
-                            else
-                                obj1[p] = mergeRecursive(obj1[p], obj2[p]);
-                        } else
-                            obj1[p] = obj2[p];
-                    } catch (e) {
-                        // Property in destination object not set; create it and set its value.
+    const preserve = (diff, left, right) => {
+      if (!isObject(diff)) return diff;
+      return Object.keys(diff).reduce((acc, key) => {
+        const leftArray = left[key];
+        const rightArray = right[key];
+        if (Array.isArray(leftArray) && Array.isArray(rightArray)) {
+          const array = [...getLargerArray(leftArray, rightArray)];
+          return {
+            ...acc,
+            [key]: array.reduce((acc2, item, index) => {
+              if (diff[key].hasOwnProperty(index)) {
+                acc2[index] = preserve(diff[key][index], leftArray[index], rightArray[index]); // diff recurse and check for nested arrays
+                return acc2;
+              }
+              delete acc2[index]; // no diff aka empty
+              return acc2;
+            }, array)
+          };
+        }
+        return {
+          ...acc,
+          [key]: diff[key]
+        };
+      }, {});
+    };
+    
+    const updatedDiff = (lhs, rhs) => {
+      if (lhs === rhs) return {};
+      if (!isObject(lhs) || !isObject(rhs)) return rhs;
+      const l = properObject(lhs);
+      const r = properObject(rhs);
+      if (isDate(l) || isDate(r)) {
+        if (l.valueOf() == r.valueOf()) return {};
+        return r;
+      }
+      return Object.keys(r).reduce((acc, key) => {
+        if (l.hasOwnProperty(key)) {
+          const difference = updatedDiff(l[key], r[key]);
+          if (isObject(difference) && isEmpty(difference) && !isDate(difference)) return acc;
+          return { ...acc, [key]: difference };
+        }
+        return acc;
+      }, {});
+    };
+    
+    
+    const diff = (lhs, rhs) => {
+      if (lhs === rhs) return {}; // equal return no diff
+      if (!isObject(lhs) || !isObject(rhs)) return rhs; // return updated rhs
+      const l = properObject(lhs);
+      const r = properObject(rhs);
+      const deletedValues = Object.keys(l).reduce((acc, key) => {
+        return r.hasOwnProperty(key) ? acc : { ...acc, [key]: null };
+      }, {});
+      if (isDate(l) || isDate(r)) {
+        if (l.valueOf() == r.valueOf()) return {};
+        return r;
+      }
+      return Object.keys(r).reduce((acc, key) => {
+        if (!l.hasOwnProperty(key)) return { ...acc, [key]: r[key] }; // return added r key
+        const difference = diff(l[key], r[key]);
+        if (isObject(difference) && isEmpty(difference) && !isDate(difference)) return acc; // return no diff
+        return { ...acc, [key]: difference }; // return updated key
+      }, deletedValues);
+    };
+    
+    const addedDiff = (lhs, rhs) => {
+      if (lhs === rhs || !isObject(lhs) || !isObject(rhs)) return {};
+      const l = properObject(lhs);
+      const r = properObject(rhs);
+      return Object.keys(r).reduce((acc, key) => {
+        if (l.hasOwnProperty(key)) {
+          const difference = addedDiff(l[key], r[key]);
+          if (isObject(difference) && isEmpty(difference)) return acc;
+          return { ...acc, [key]: difference };
+        }
+        return { ...acc, [key]: r[key] };
+      }, {});
+    };
+    
+    const arrayDiff = (lhs, rhs) => {
+      if (lhs === rhs) return {}; // equal return no diff
+      if (!isObject(lhs) || !isObject(rhs)) return rhs; // return updated rhs
+      const l = properObject(lhs);
+      const r = properObject(rhs);
+      const deletedValues = Object.keys(l).reduce((acc, key) => {
+        return r.hasOwnProperty(key) ? acc : { ...acc, [key]: null };
+      }, {});
+      if (isDate(l) || isDate(r)) {
+        if (l.valueOf() == r.valueOf()) return {};
+        return r;
+      }
+      if (Array.isArray(r) && Array.isArray(l)) {
+        const deletedValues = l.reduce((acc, item, index) => {
+          return r.hasOwnProperty(index) ? acc.concat(item) : acc.concat(null);
+        }, []);
+        return r.reduce((acc, rightItem, index) => {
+          if (!deletedValues.hasOwnProperty(index)) {
+            return acc.concat(rightItem);
+          }
+          const leftItem = l[index];
+          const difference = diff(rightItem, leftItem);
+          if (isObject(difference) && isEmpty(difference) && !isDate(difference)) {
+            delete acc[index];
+            return acc; // return no diff
+          }
+          return acc.slice(0, index).concat(rightItem).concat(acc.slice(index + 1)); // return updated key
+        }, deletedValues);
+      }
+    
+      return Object.keys(r).reduce((acc, key) => {
+        if (!l.hasOwnProperty(key)) return { ...acc, [key]: r[key] }; // return added r key
+        const difference = diff(l[key], r[key]);
+        if (isObject(difference) && isEmpty(difference) && !isDate(difference)) return acc; // return no diff
+        return { ...acc, [key]: difference }; // return updated key
+      }, deletedValues);
+    };
+    
+    const deletedDiff = (lhs, rhs) => {
+      if (lhs === rhs || !isObject(lhs) || !isObject(rhs)) return {};
+      const l = properObject(lhs);
+      const r = properObject(rhs);
+      return Object.keys(l).reduce((acc, key) => {
+        if (r.hasOwnProperty(key)) {
+          const difference = deletedDiff(l[key], r[key]);
+          if (isObject(difference) && isEmpty(difference)) return acc;
+          return { ...acc, [key]: difference };
+        }
+        return { ...acc, [key]: null };
+      }, {});
+    };
+    window.findDiff = (lhs, rhs) => ({
+      added: addedDiff(lhs, rhs),
+      deleted: deletedDiff(lhs, rhs),
+      updated: updatedDiff(lhs, rhs),
+    });
+    
+    const mergeRecursive = (obj1, obj2) => {
+        for (var p in obj2) {
+            try {
+                if(obj2[p].constructor == Object) 
+                    obj1[p] = mergeRecursive(obj1[p], obj2[p]);
+                // Property in destination object set; update its value.
+                else if (Ext.isArray(obj2[p])) {
+                    // obj1[p] = [];
+                    if (obj2[p].length < 1) 
                         obj1[p] = obj2[p];
-                    }
-                }
-                return obj1;
+                    else 
+                        obj1[p] = mergeRecursive(obj1[p], obj2[p]);
+                }else
+                    obj1[p] = obj2[p];
+            } catch (e) {
+                // Property in destination object not set; create it and set its value.
+                obj1[p] = obj2[p];
             }
-
-            const cleanse = (obj) => {
-                Object.keys(obj).forEach(key => {
-                    var value = obj[key];
-                    if (typeof value === "object" && value !== null) {
-                        // Recurse...
-                        cleanse(value);
-                        // ...and remove if now "empty" (NOTE: insert your definition of "empty" here)
-                        //if (!Object.keys(value).length) 
-                        //  delete obj[key];
-                    }
-                    else if (value === null)
-                        delete obj[key];// null, remove it
-                });
-                if (obj.constructor.toString().indexOf("Array") != -1) {
-                    obj = obj.filter(function (el) {
-                        return el != null;
-                    });
-                }
-                return obj;
+        }
+        return obj1;
+    }
+    
+    const cleanse = (obj) => {
+        Object.keys(obj).forEach(key => {
+            var value = obj[key];
+            if (typeof value === "object" && value !== null) {
+                // Recurse...
+                cleanse(value);
+                // ...and remove if now "empty" (NOTE: insert your definition of "empty" here)
+                //if (!Object.keys(value).length) 
+                  //  delete obj[key];
             }
+            else if (value === null) 
+                delete obj[key];// null, remove it
+        });
+        if(obj.constructor.toString().indexOf("Array") != -1)  {obj = obj.filter(function (el) {
+            return el != null;
+        });}
+        return obj; 
+    }
+    
+    /*obj is original object or array, diff is the output of findDiff */
+    window.mergeDiff = (obj, diff) => {
+      if(Object.keys(diff.updated).length !== 0)
+        obj = mergeRecursive(obj, diff.updated)
+      if(Object.keys(diff.deleted).length !== 0){
+        obj = mergeRecursive(obj, diff.deleted)
+        obj = cleanse(obj)
+      }
+      if(Object.keys(diff.added).length !== 0)
+        obj = mergeRecursive(obj, diff.added)
+        return obj
+    }
+})();
+</script>
 
-            /*obj is original object or array, diff is the output of findDiff */
-            window.mergeDiff = (obj, diff) => {
-                if (Object.keys(diff.updated).length !== 0)
-                    obj = mergeRecursive(obj, diff.updated)
-                if (Object.keys(diff.deleted).length !== 0) {
-                    obj = mergeRecursive(obj, diff.deleted)
-                    obj = cleanse(obj)
-                }
-                if (Object.keys(diff.added).length !== 0)
-                    obj = mergeRecursive(obj, diff.added)
-                return obj
-            }
-        })();
-    </script>
+<script id="floCrypto" version="2.0.1">
+    /* FLO Crypto Operators*/
+    const floCrypto = {
 
-    <script id="floCrypto" version="2.0.1">
-        /* FLO Crypto Operators*/
-        const floCrypto = {
+        util: {
+            p: BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F", 16),
 
-            util: {
-                p: BigInteger("FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F", 16),
+            ecparams: EllipticCurve.getSECCurveByName("secp256k1"),
 
-                ecparams: EllipticCurve.getSECCurveByName("secp256k1"),
+            asciiAlternatives: `‘ '\n’ '\n“ "\n” "\n– --\n— ---\n≥ >=\n≤ <=\n≠ !=\n× *\n÷ /\n← <-\n→ ->\n↔ <->\n⇒ =>\n⇐ <=\n⇔ <=>`,
 
-                asciiAlternatives: `‘ '\n’ '\n“ "\n” "\n– --\n— ---\n≥ >=\n≤ <=\n≠ !=\n× *\n÷ /\n← <-\n→ ->\n↔ <->\n⇒ =>\n⇐ <=\n⇔ <=>`,
-
-                exponent1: function () {
-                    return this.p.add(BigInteger.ONE).divide(BigInteger("4"))
-                },
-
-                calculateY: function (x) {
-                    let p = this.p;
-                    let exp = this.exponent1();
-                    // x is x value of public key in BigInteger format without 02 or 03 or 04 prefix
-                    return x.modPow(BigInteger("3"), p).add(BigInteger("7")).mod(p).modPow(exp, p)
-                },
-                getUncompressedPublicKey: function (compressedPublicKey) {
-                    const p = this.p;
-                    // Fetch x from compressedPublicKey
-                    let pubKeyBytes = Crypto.util.hexToBytes(compressedPublicKey);
-                    const prefix = pubKeyBytes.shift() // remove prefix
-                    let prefix_modulus = prefix % 2;
-                    pubKeyBytes.unshift(0) // add prefix 0
-                    let x = new BigInteger(pubKeyBytes)
-                    let xDecimalValue = x.toString()
-                    // Fetch y
-                    let y = this.calculateY(x);
-                    let yDecimalValue = y.toString();
-                    // verify y value
-                    let resultBigInt = y.mod(BigInteger("2"));
-                    let check = resultBigInt.toString() % 2;
-                    if (prefix_modulus !== check)
-                        yDecimalValue = y.negate().mod(p).toString();
-                    return {
-                        x: xDecimalValue,
-                        y: yDecimalValue
-                    };
-                },
-
-                getSenderPublicKeyString: function () {
-                    privateKey = ellipticCurveEncryption.senderRandom();
-                    senderPublicKeyString = ellipticCurveEncryption.senderPublicString(privateKey);
-                    return {
-                        privateKey: privateKey,
-                        senderPublicKeyString: senderPublicKeyString
-                    }
-                },
-
-                deriveSharedKeySender: function (receiverCompressedPublicKey, senderPrivateKey) {
-                    let receiverPublicKeyString = this.getUncompressedPublicKey(receiverCompressedPublicKey);
-                    var senderDerivedKey = ellipticCurveEncryption.senderSharedKeyDerivation(
-                        receiverPublicKeyString.x, receiverPublicKeyString.y, senderPrivateKey);
-                    return senderDerivedKey;
-                },
-
-                deriveReceiverSharedKey: function (senderPublicKeyString, receiverPrivateKey) {
-                    return ellipticCurveEncryption.receiverSharedKeyDerivation(
-                        senderPublicKeyString.XValuePublicString, senderPublicKeyString.YValuePublicString, receiverPrivateKey);
-                },
-
-                getReceiverPublicKeyString: function (privateKey) {
-                    return ellipticCurveEncryption.receiverPublicString(privateKey);
-                },
-
-                deriveSharedKeyReceiver: function (senderPublicKeyString, receiverPrivateKey) {
-                    return ellipticCurveEncryption.receiverSharedKeyDerivation(
-                        senderPublicKeyString.XValuePublicString, senderPublicKeyString.YValuePublicString, receiverPrivateKey);
-                },
-
-                wifToDecimal: function (pk_wif, isPubKeyCompressed = false) {
-                    let pk = Bitcoin.Base58.decode(pk_wif)
-                    pk.shift()
-                    pk.splice(-4, 4)
-                    //If the private key corresponded to a compressed public key, also drop the last byte (it should be 0x01).
-                    if (isPubKeyCompressed == true) pk.pop()
-                    pk.unshift(0)
-                    privateKeyDecimal = BigInteger(pk).toString()
-                    privateKeyHex = Crypto.util.bytesToHex(pk)
-                    return {
-                        privateKeyDecimal: privateKeyDecimal,
-                        privateKeyHex: privateKeyHex
-                    }
-                }
+            exponent1: function() {
+                return this.p.add(BigInteger.ONE).divide(BigInteger("4"))
             },
 
-            //generate a random Interger within range
-            randInt: function (min, max) {
-                min = Math.ceil(min);
-                max = Math.floor(max);
-                return Math.floor(Math.random() * (max - min + 1)) + min;
+            calculateY: function(x) {
+                let p = this.p;
+                let exp = this.exponent1();
+                // x is x value of public key in BigInteger format without 02 or 03 or 04 prefix
+                return x.modPow(BigInteger("3"), p).add(BigInteger("7")).mod(p).modPow(exp, p)
             },
-
-            //generate a random String within length (options : alphaNumeric chars only)
-            randString: function (length, alphaNumeric = true) {
-                var result = '';
-                if (alphaNumeric)
-                    var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-                else
-                    var characters =
-                        'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_+-./*?@#&$<>=[]{}():';
-                for (var i = 0; i < length; i++)
-                    result += characters.charAt(Math.floor(Math.random() * characters.length));
-                return result;
-            },
-
-            //Encrypt Data using public-key
-            encryptData: function (data, receiverCompressedPublicKey) {
-                var senderECKeyData = this.util.getSenderPublicKeyString();
-                var senderDerivedKey = this.util.deriveSharedKeySender(receiverCompressedPublicKey, senderECKeyData
-                    .privateKey);
-                let senderKey = senderDerivedKey.XValue + senderDerivedKey.YValue;
-                let secret = Crypto.AES.encrypt(data, senderKey);
+            getUncompressedPublicKey: function(compressedPublicKey) {
+                const p = this.p;
+                // Fetch x from compressedPublicKey
+                let pubKeyBytes = Crypto.util.hexToBytes(compressedPublicKey);
+                const prefix = pubKeyBytes.shift() // remove prefix
+                let prefix_modulus = prefix % 2;
+                pubKeyBytes.unshift(0) // add prefix 0
+                let x = new BigInteger(pubKeyBytes)
+                let xDecimalValue = x.toString()
+                // Fetch y
+                let y = this.calculateY(x);
+                let yDecimalValue = y.toString();
+                // verify y value
+                let resultBigInt = y.mod(BigInteger("2"));
+                let check = resultBigInt.toString() % 2;
+                if (prefix_modulus !== check)
+                    yDecimalValue = y.negate().mod(p).toString();
                 return {
-                    secret: secret,
-                    senderPublicKeyString: senderECKeyData.senderPublicKeyString
+                    x: xDecimalValue,
+                    y: yDecimalValue
                 };
             },
 
-            //Decrypt Data using private-key
-            decryptData: function (data, myPrivateKey) {
-                var receiverECKeyData = {};
-                if (typeof myPrivateKey !== "string") throw new Error("No private key found.");
-
-                let privateKey = this.util.wifToDecimal(myPrivateKey, true);
-                if (typeof privateKey.privateKeyDecimal !== "string") throw new Error(
-                    "Failed to detremine your private key.");
-                receiverECKeyData.privateKey = privateKey.privateKeyDecimal;
-
-                var receiverDerivedKey = this.util.deriveReceiverSharedKey(data.senderPublicKeyString,
-                    receiverECKeyData
-                        .privateKey);
-
-                let receiverKey = receiverDerivedKey.XValue + receiverDerivedKey.YValue;
-                let decryptMsg = Crypto.AES.decrypt(data.secret, receiverKey);
-                return decryptMsg;
-            },
-
-            //Sign data using private-key
-            signData: function (data, privateKeyHex) {
-                var key = new Bitcoin.ECKey(privateKeyHex);
-                key.setCompressed(true);
-
-                var privateKeyArr = key.getBitcoinPrivateKeyByteArray();
-                privateKey = BigInteger.fromByteArrayUnsigned(privateKeyArr);
-                var messageHash = Crypto.SHA256(data);
-
-                var messageHashBigInteger = new BigInteger(messageHash);
-                var messageSign = Bitcoin.ECDSA.sign(messageHashBigInteger, key.priv);
-
-                var sighex = Crypto.util.bytesToHex(messageSign);
-                return sighex;
-            },
-
-            //Verify signatue of the data using public-key
-            verifySign: function (data, signatureHex, publicKeyHex) {
-                var msgHash = Crypto.SHA256(data);
-                var messageHashBigInteger = new BigInteger(msgHash);
-
-                var sigBytes = Crypto.util.hexToBytes(signatureHex);
-                var signature = Bitcoin.ECDSA.parseSig(sigBytes);
-
-                var publicKeyPoint = this.util.ecparams.getCurve().decodePointHex(publicKeyHex);
-
-                var verify = Bitcoin.ECDSA.verifyRaw(messageHashBigInteger, signature.r, signature.s,
-                    publicKeyPoint);
-                return verify;
-            },
-
-            //Generates a new flo ID and returns private-key, public-key and floID
-            generateNewID: function () {
-                try {
-                    var key = new Bitcoin.ECKey(false);
-                    key.setCompressed(true);
-                    return {
-                        floID: key.getBitcoinAddress(),
-                        pubKey: key.getPubKeyHex(),
-                        privKey: key.getBitcoinWalletImportFormat()
-                    }
-                } catch (e) {
-                    console.error(e);
+            getSenderPublicKeyString: function() {
+                privateKey = ellipticCurveEncryption.senderRandom();
+                senderPublicKeyString = ellipticCurveEncryption.senderPublicString(privateKey);
+                return {
+                    privateKey: privateKey,
+                    senderPublicKeyString: senderPublicKeyString
                 }
             },
 
-            //Returns public-key from private-key
-            getPubKeyHex: function (privateKeyHex) {
-                if (!privateKeyHex)
-                    return null;
+            deriveSharedKeySender: function(receiverCompressedPublicKey, senderPrivateKey) {
+                let receiverPublicKeyString = this.getUncompressedPublicKey(receiverCompressedPublicKey);
+                var senderDerivedKey = ellipticCurveEncryption.senderSharedKeyDerivation(
+                    receiverPublicKeyString.x, receiverPublicKeyString.y, senderPrivateKey);
+                return senderDerivedKey;
+            },
+
+            deriveReceiverSharedKey: function(senderPublicKeyString, receiverPrivateKey) {
+                return ellipticCurveEncryption.receiverSharedKeyDerivation(
+                    senderPublicKeyString.XValuePublicString, senderPublicKeyString.YValuePublicString, receiverPrivateKey);
+            },
+
+            getReceiverPublicKeyString: function(privateKey) {
+                return ellipticCurveEncryption.receiverPublicString(privateKey);
+            },
+
+            deriveSharedKeyReceiver: function(senderPublicKeyString, receiverPrivateKey) {
+                return ellipticCurveEncryption.receiverSharedKeyDerivation(
+                    senderPublicKeyString.XValuePublicString, senderPublicKeyString.YValuePublicString, receiverPrivateKey);
+            },
+
+            wifToDecimal: function(pk_wif, isPubKeyCompressed = false) {
+                let pk = Bitcoin.Base58.decode(pk_wif)
+                pk.shift()
+                pk.splice(-4, 4)
+                //If the private key corresponded to a compressed public key, also drop the last byte (it should be 0x01).
+                if (isPubKeyCompressed == true) pk.pop()
+                pk.unshift(0)
+                privateKeyDecimal = BigInteger(pk).toString()
+                privateKeyHex = Crypto.util.bytesToHex(pk)
+                return {
+                    privateKeyDecimal: privateKeyDecimal,
+                    privateKeyHex: privateKeyHex
+                }
+            }
+        },
+
+        //generate a random Interger within range
+        randInt: function(min, max) {
+            min = Math.ceil(min);
+            max = Math.floor(max);
+            return Math.floor(Math.random() * (max - min + 1)) + min;
+        },
+
+        //generate a random String within length (options : alphaNumeric chars only)
+        randString: function(length, alphaNumeric = true) {
+            var result = '';
+            if (alphaNumeric)
+                var characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
+            else
+                var characters =
+                    'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_+-./*?@#&$<>=[]{}():';
+            for (var i = 0; i < length; i++)
+                result += characters.charAt(Math.floor(Math.random() * characters.length));
+            return result;
+        },
+
+        //Encrypt Data using public-key
+        encryptData: function(data, receiverCompressedPublicKey) {
+            var senderECKeyData = this.util.getSenderPublicKeyString();
+            var senderDerivedKey = this.util.deriveSharedKeySender(receiverCompressedPublicKey, senderECKeyData
+                .privateKey);
+            let senderKey = senderDerivedKey.XValue + senderDerivedKey.YValue;
+            let secret = Crypto.AES.encrypt(data, senderKey);
+            return {
+                secret: secret,
+                senderPublicKeyString: senderECKeyData.senderPublicKeyString
+            };
+        },
+
+        //Decrypt Data using private-key
+        decryptData: function(data, myPrivateKey) {
+            var receiverECKeyData = {};
+            if (typeof myPrivateKey !== "string") throw new Error("No private key found.");
+
+            let privateKey = this.util.wifToDecimal(myPrivateKey, true);
+            if (typeof privateKey.privateKeyDecimal !== "string") throw new Error(
+                "Failed to detremine your private key.");
+            receiverECKeyData.privateKey = privateKey.privateKeyDecimal;
+
+            var receiverDerivedKey = this.util.deriveReceiverSharedKey(data.senderPublicKeyString,
+                receiverECKeyData
+                .privateKey);
+
+            let receiverKey = receiverDerivedKey.XValue + receiverDerivedKey.YValue;
+            let decryptMsg = Crypto.AES.decrypt(data.secret, receiverKey);
+            return decryptMsg;
+        },
+
+        //Sign data using private-key
+        signData: function(data, privateKeyHex) {
+            var key = new Bitcoin.ECKey(privateKeyHex);
+            key.setCompressed(true);
+
+            var privateKeyArr = key.getBitcoinPrivateKeyByteArray();
+            privateKey = BigInteger.fromByteArrayUnsigned(privateKeyArr);
+            var messageHash = Crypto.SHA256(data);
+
+            var messageHashBigInteger = new BigInteger(messageHash);
+            var messageSign = Bitcoin.ECDSA.sign(messageHashBigInteger, key.priv);
+
+            var sighex = Crypto.util.bytesToHex(messageSign);
+            return sighex;
+        },
+
+        //Verify signatue of the data using public-key
+        verifySign: function(data, signatureHex, publicKeyHex) {
+            var msgHash = Crypto.SHA256(data);
+            var messageHashBigInteger = new BigInteger(msgHash);
+
+            var sigBytes = Crypto.util.hexToBytes(signatureHex);
+            var signature = Bitcoin.ECDSA.parseSig(sigBytes);
+
+            var publicKeyPoint = this.util.ecparams.getCurve().decodePointHex(publicKeyHex);
+
+            var verify = Bitcoin.ECDSA.verifyRaw(messageHashBigInteger, signature.r, signature.s,
+                publicKeyPoint);
+            return verify;
+        },
+
+        //Generates a new flo ID and returns private-key, public-key and floID
+        generateNewID: function() {
+            try {
+                var key = new Bitcoin.ECKey(false);
+                key.setCompressed(true);
+                return {
+                    floID: key.getBitcoinAddress(),
+                    pubKey: key.getPubKeyHex(),
+                    privKey: key.getBitcoinWalletImportFormat()
+                }
+            } catch (e) {
+                console.error(e);
+            }
+        },
+
+        //Returns public-key from private-key
+        getPubKeyHex: function(privateKeyHex) {
+            if (!privateKeyHex)
+                return null;
+            var key = new Bitcoin.ECKey(privateKeyHex);
+            if (key.priv == null)
+                return null;
+            key.setCompressed(true);
+            return key.getPubKeyHex();
+        },
+
+        //Returns flo-ID from public-key or private-key
+        getFloID: function(keyHex) {
+            if (!keyHex)
+                return null;
+            try {
+                var key = new Bitcoin.ECKey(keyHex);
+                if (key.priv == null)
+                    key.setPub(keyHex);
+                return key.getBitcoinAddress();
+            } catch (e) {
+                return null;
+            }
+        },
+
+        //Verify the private-key for the given public-key or flo-ID
+        verifyPrivKey: function(privateKeyHex, pubKey_floID, isfloID = true) {
+            if (!privateKeyHex || !pubKey_floID)
+                return false;
+            try {
                 var key = new Bitcoin.ECKey(privateKeyHex);
                 if (key.priv == null)
-                    return null;
+                    return false;
                 key.setCompressed(true);
-                return key.getPubKeyHex();
-            },
-
-            //Returns flo-ID from public-key or private-key
-            getFloID: function (keyHex) {
-                if (!keyHex)
-                    return null;
-                try {
-                    var key = new Bitcoin.ECKey(keyHex);
-                    if (key.priv == null)
-                        key.setPub(keyHex);
-                    return key.getBitcoinAddress();
-                } catch (e) {
-                    return null;
-                }
-            },
-
-            //Verify the private-key for the given public-key or flo-ID
-            verifyPrivKey: function (privateKeyHex, pubKey_floID, isfloID = true) {
-                if (!privateKeyHex || !pubKey_floID)
-                    return false;
-                try {
-                    var key = new Bitcoin.ECKey(privateKeyHex);
-                    if (key.priv == null)
-                        return false;
-                    key.setCompressed(true);
-                    if (isfloID && pubKey_floID == key.getBitcoinAddress())
-                        return true;
-                    else if (!isfloID && pubKey_floID == key.getPubKeyHex())
-                        return true;
-                    else
-                        return false;
-                } catch (e) {
-                    console.error(e);
-                }
-            },
-
-            //Check if the given Address is valid or not
-            validateAddr: function (inpAddr) {
-                if (!inpAddr)
-                    return false;
-                try {
-                    var addr = new Bitcoin.Address(inpAddr);
+                if (isfloID && pubKey_floID == key.getBitcoinAddress())
                     return true;
-                } catch {
-                    return false;
-                }
-            },
-
-            //Split the str using shamir's Secret and Returns the shares 
-            createShamirsSecretShares: function (str, total_shares, threshold_limit) {
-                try {
-                    if (str.length > 0) {
-                        var strHex = shamirSecretShare.str2hex(str);
-                        var shares = shamirSecretShare.share(strHex, total_shares, threshold_limit);
-                        return shares;
-                    }
-                    return false;
-                } catch {
-                    return false
-                }
-            },
-
-            //Verifies the shares and str
-            verifyShamirsSecret: function (sharesArray, str) {
-                return (str && this.retrieveShamirSecret(sharesArray) === str)
-            },
-
-            //Returns the retrived secret by combining the shamirs shares
-            retrieveShamirSecret: function (sharesArray) {
-                try {
-                    if (sharesArray.length > 0) {
-                        var comb = shamirSecretShare.combine(sharesArray.slice(0, sharesArray.length));
-                        comb = shamirSecretShare.hex2str(comb);
-                        return comb;
-                    }
-                    return false;
-                } catch {
-                    return false;
-                }
-            },
-
-            validateASCII: function (string, bool = true) {
-                if (typeof string !== "string")
-                    return null;
-                if (bool) {
-                    let x;
-                    for (let i = 0; i < string.length; i++) {
-                        x = string.charCodeAt(i);
-                        if (x < 32 || x > 127)
-                            return false;
-                    }
+                else if (!isfloID && pubKey_floID == key.getPubKeyHex())
                     return true;
-                } else {
-                    let x, invalids = {};
-                    for (let i = 0; i < string.length; i++) {
-                        x = string.charCodeAt(i);
-                        if (x < 32 || x > 127)
-                            if (x in invalids)
-                                invalids[string[i]].push(i)
-                            else
-                                invalids[string[i]] = [i];
-                    }
-                    if (Object.keys(invalids).length)
-                        return invalids;
-                    else
-                        return true;
-                }
-            },
-
-            convertToASCII: function (string, mode = 'soft-remove') {
-                let chars = this.validateASCII(string, false);
-                if (chars === true)
-                    return string;
-                else if (chars === null)
-                    return null;
-                let convertor, result = string,
-                    refAlt = {};
-                this.util.asciiAlternatives.split('\n').forEach(a => refAlt[a[0]] = a.slice(2));
-                mode = mode.toLowerCase();
-                if (mode === "hard-unicode")
-                    convertor = (c) => `\\u${('000' + c.charCodeAt().toString(16)).slice(-4)}`;
-                else if (mode === "soft-unicode")
-                    convertor = (c) => refAlt[c] || `\\u${('000' + c.charCodeAt().toString(16)).slice(-4)}`;
-                else if (mode === "hard-remove")
-                    convertor = c => "";
-                else if (mode === "soft-remove")
-                    convertor = c => refAlt[c] || "";
                 else
-                    return null;
-                for (let c in chars)
-                    result = result.replaceAll(c, convertor(c));
-                return result;
-            },
-
-            revertUnicode: function (string) {
-                return string.replace(/\\u[\dA-F]{4}/gi,
-                    m => String.fromCharCode(parseInt(m.replace(/\\u/g, ''), 16)));
+                    return false;
+            } catch (e) {
+                console.error(e);
             }
-        }
-    </script>
-    <script id="floBlockchainAPI" version="2.0.1c">
-        /* FLO Blockchain Operator to send/receive data from blockchain using API calls*/
-        const floBlockchainAPI = {
+        },
 
-            util: {
-                serverList: floGlobals.apiURL[floGlobals.blockchain].slice(0),
-                curPos: floCrypto.randInt(0, floGlobals.apiURL[floGlobals.blockchain].length),
-                fetch_retry: function (apicall) {
-                    return new Promise((resolve, reject) => {
-                        this.serverList.splice(this.curPos, 1);
-                        this.curPos = floCrypto.randInt(0, this.serverList.length - 1)
-                        this.fetch_api(apicall)
-                            .then(result => resolve(result))
-                            .catch(error => reject(error));
-                    })
-                },
-                fetch_api: function (apicall) {
-                    return new Promise((resolve, reject) => {
-                        if (this.serverList.length === 0)
-                            reject("No floSight server working")
-                        else {
-                            fetch(this.serverList[this.curPos] + apicall).then(response => {
-                                if (response.ok)
-                                    response.json().then(data => resolve(data));
-                                else {
-                                    this.fetch_retry(apicall)
-                                        .then(result => resolve(result))
-                                        .catch(error => reject(error));
-                                }
-                            }).catch(error => {
-                                this.fetch_retry(apicall)
-                                    .then(result => resolve(result))
-                                    .catch(error => reject(error));
-                            })
-                        }
-                    })
+        //Check if the given Address is valid or not
+        validateAddr: function(inpAddr) {
+            if (!inpAddr)
+                return false;
+            try {
+                var addr = new Bitcoin.Address(inpAddr);
+                return true;
+            } catch {
+                return false;
+            }
+        },
+
+        //Split the str using shamir's Secret and Returns the shares 
+        createShamirsSecretShares: function(str, total_shares, threshold_limit) {
+            try {
+                if (str.length > 0) {
+                    var strHex = shamirSecretShare.str2hex(str);
+                    var shares = shamirSecretShare.share(strHex, total_shares, threshold_limit);
+                    return shares;
                 }
-            },
+                return false;
+            } catch {
+                return false
+            }
+        },
 
-            //Promised function to get data from API
-            promisedAPI: function (apicall) {
+        //Verifies the shares and str
+        verifyShamirsSecret: function(sharesArray, str) {
+            return (str && this.retrieveShamirSecret(sharesArray) === str)
+        },
+
+        //Returns the retrived secret by combining the shamirs shares
+        retrieveShamirSecret: function(sharesArray) {
+            try {
+                if (sharesArray.length > 0) {
+                    var comb = shamirSecretShare.combine(sharesArray.slice(0, sharesArray.length));
+                    comb = shamirSecretShare.hex2str(comb);
+                    return comb;
+                }
+                return false;
+            } catch {
+                return false;
+            }
+        },
+
+        validateASCII: function(string, bool = true) {
+            if (typeof string !== "string")
+                return null;
+            if (bool) {
+                let x;
+                for (let i = 0; i < string.length; i++) {
+                    x = string.charCodeAt(i);
+                    if (x < 32 || x > 127)
+                        return false;
+                }
+                return true;
+            } else {
+                let x, invalids = {};
+                for (let i = 0; i < string.length; i++) {
+                    x = string.charCodeAt(i);
+                    if (x < 32 || x > 127)
+                        if (x in invalids)
+                            invalids[string[i]].push(i)
+                    else
+                        invalids[string[i]] = [i];
+                }
+                if (Object.keys(invalids).length)
+                    return invalids;
+                else
+                    return true;
+            }
+        },
+
+        convertToASCII: function(string, mode = 'soft-remove') {
+            let chars = this.validateASCII(string, false);
+            if (chars === true)
+                return string;
+            else if (chars === null)
+                return null;
+            let convertor, result = string,
+                refAlt = {};
+            this.util.asciiAlternatives.split('\n').forEach(a => refAlt[a[0]] = a.slice(2));
+            mode = mode.toLowerCase();
+            if (mode === "hard-unicode")
+                convertor = (c) => `\\u${('000'+c.charCodeAt().toString(16)).slice(-4)}`;
+            else if (mode === "soft-unicode")
+                convertor = (c) => refAlt[c] || `\\u${('000'+c.charCodeAt().toString(16)).slice(-4)}`;
+            else if (mode === "hard-remove")
+                convertor = c => "";
+            else if (mode === "soft-remove")
+                convertor = c => refAlt[c] || "";
+            else
+                return null;
+            for (let c in chars)
+                result = result.replaceAll(c, convertor(c));
+            return result;
+        },
+
+        revertUnicode: function(string) {
+            return string.replace(/\\u[\dA-F]{4}/gi,
+                m => String.fromCharCode(parseInt(m.replace(/\\u/g, ''), 16)));
+        }
+    }
+</script>
+<script id="floBlockchainAPI" version="2.1.1a">
+    /* FLO Blockchain Operator to send/receive data from blockchain using API calls*/
+    const floBlockchainAPI = {
+
+        util: {
+            serverList: floGlobals.apiURL[floGlobals.blockchain].slice(0),
+            curPos: floCrypto.randInt(0, floGlobals.apiURL[floGlobals.blockchain].length - 1),
+            fetch_retry: function(apicall, rm_flosight) {
                 return new Promise((resolve, reject) => {
-                    console.log(apicall)
-                    this.util.fetch_api(apicall)
+                    let i = this.serverList.indexOf(rm_flosight)
+                    if (i != -1) this.serverList.splice(i, 1);
+                    this.curPos = floCrypto.randInt(0, this.serverList.length - 1);
+                    this.fetch_api(apicall)
                         .then(result => resolve(result))
                         .catch(error => reject(error));
-                });
+                })
             },
-
-            //Get balance for the given Address
-            getBalance: function (addr) {
+            fetch_api: function(apicall) {
                 return new Promise((resolve, reject) => {
-                    this.promisedAPI(`api/addr/${addr}/balance`)
-                        .then(balance => resolve(parseFloat(balance)))
-                        .catch(error => reject(error));
-                });
-            },
-
-            //Write Data into blockchain
-            writeData: function (senderAddr, data, privKey, receiverAddr = floGlobals.adminID) {
-                return new Promise((resolve, reject) => {
-                    if (typeof data != "string")
-                        data = JSON.stringify(data);
-                    this.sendTx(senderAddr, receiverAddr, floGlobals.sendAmt, privKey, data)
-                        .then(txid => resolve(txid))
-                        .catch(error => reject(error))
-                });
-            },
-
-            //Send Tx to blockchain 
-            sendTx: function (senderAddr, receiverAddr, sendAmt, privKey, floData = '') {
-                return new Promise((resolve, reject) => {
-                    if (!floCrypto.validateASCII(floData))
-                        return reject("Invalid FLO_Data: only printable ASCII characters are allowed");
-                    if (!floCrypto.validateAddr(senderAddr))
-                        reject(`Invalid address : ${senderAddr}`);
-                    else if (!floCrypto.validateAddr(receiverAddr))
-                        reject(`Invalid address : ${receiverAddr}`);
-                    if (privKey.length < 1 || !floCrypto.verifyPrivKey(privKey, senderAddr))
-                        reject("Invalid Private key!");
-                    else if (typeof sendAmt !== 'number' || sendAmt <= 0)
-                        reject(`Invalid sendAmt : ${sendAmt}`);
+                    if (this.serverList.length === 0)
+                        reject("No floSight server working");
                     else {
-                        var trx = bitjs.transaction();
-                        var utxoAmt = 0.0;
-                        var fee = floGlobals.fee;
+                        let flosight = this.serverList[this.curPos];
+                        fetch(flosight + apicall).then(response => {
+                            if (response.ok)
+                                response.json().then(data => resolve(data));
+                            else {
+                                this.fetch_retry(apicall, flosight)
+                                    .then(result => resolve(result))
+                                    .catch(error => reject(error));
+                            }
+                        }).catch(error => {
+                            this.fetch_retry(apicall, flosight)
+                                .then(result => resolve(result))
+                                .catch(error => reject(error));
+                        })
+                    }
+                })
+            },
+
+            current: function() {
+                return this.serverList[this.curPos];
+            }
+        },
+
+        //Promised function to get data from API
+        promisedAPI: function(apicall) {
+            return new Promise((resolve, reject) => {
+                //console.log(apicall);
+                this.util.fetch_api(apicall)
+                    .then(result => resolve(result))
+                    .catch(error => reject(error));
+            });
+        },
+
+        //Get balance for the given Address
+        getBalance: function(addr) {
+            return new Promise((resolve, reject) => {
+                this.promisedAPI(`api/addr/${addr}/balance`)
+                    .then(balance => resolve(parseFloat(balance)))
+                    .catch(error => reject(error));
+            });
+        },
+
+        //Write Data into blockchain
+        writeData: function(senderAddr, data, privKey, receiverAddr = floGlobals.adminID, strict_utxo = true) {
+            return new Promise((resolve, reject) => {
+                if (typeof data != "string")
+                    data = JSON.stringify(data);
+                this.sendTx(senderAddr, receiverAddr, floGlobals.sendAmt, privKey, data, strict_utxo)
+                    .then(txid => resolve(txid))
+                    .catch(error => reject(error));
+            });
+        },
+
+        //Send Tx to blockchain 
+        sendTx: function(senderAddr, receiverAddr, sendAmt, privKey, floData = '', strict_utxo = true) {
+            return new Promise((resolve, reject) => {
+                if (!floCrypto.validateASCII(floData))
+                    return reject("Invalid FLO_Data: only printable ASCII characters are allowed");
+                else if (!floCrypto.validateAddr(senderAddr))
+                    return reject(`Invalid address : ${senderAddr}`);
+                else if (!floCrypto.validateAddr(receiverAddr))
+                    return reject(`Invalid address : ${receiverAddr}`);
+                else if (privKey.length < 1 || !floCrypto.verifyPrivKey(privKey, senderAddr))
+                    return reject("Invalid Private key!");
+                else if (typeof sendAmt !== 'number' || sendAmt <= 0)
+                    return reject(`Invalid sendAmt : ${sendAmt}`);
+
+                //get unconfirmed tx list
+                this.promisedAPI(`api/addr/${senderAddr}`).then(result => {
+                    this.readTxs(senderAddr, 0, result.unconfirmedTxApperances).then(result => {
+                        let unconfirmedSpent = {};
+                        for (let tx of result.items)
+                            if (tx.confirmations == 0)
+                                for (let vin of tx.vin)
+                                    if (vin.addr === senderAddr) {
+                                        if (Array.isArray(unconfirmedSpent[vin.txid]))
+                                            unconfirmedSpent[vin.txid].push(vin.vout);
+                                        else
+                                            unconfirmedSpent[vin.txid] = [vin.vout];
+                                    }
+                        //get utxos list
                         this.promisedAPI(`api/addr/${senderAddr}/utxo`).then(utxos => {
+                            //form/construct the transaction data
+                            var trx = bitjs.transaction();
+                            var utxoAmt = 0.0;
+                            var fee = floGlobals.fee;
                             for (var i = utxos.length - 1;
                                 (i >= 0) && (utxoAmt < sendAmt + fee); i--) {
-                                if (utxos[i].confirmations) {
-                                    trx.addinput(utxos[i].txid, utxos[i].vout, utxos[i]
-                                        .scriptPubKey)
+                                //use only utxos with confirmations (strict_utxo mode)
+                                if (utxos[i].confirmations || !strict_utxo) {
+                                    if (utxos[i].txid in unconfirmedSpent && unconfirmedSpent[utxos[i].txid].includes(utxos[i].vout))
+                                        continue; //A transaction has already used this utxo, but is unconfirmed.
+                                    trx.addinput(utxos[i].txid, utxos[i].vout, utxos[i].scriptPubKey);
                                     utxoAmt += utxos[i].amount;
-                                } else break;
+                                };
                             }
                             if (utxoAmt < sendAmt + fee)
-                                reject("Insufficient balance!");
+                                reject("Insufficient FLO balance!");
                             else {
                                 trx.addoutput(receiverAddr, sendAmt);
                                 var change = utxoAmt - sendAmt - fee;
@@ -7536,1940 +7559,1617 @@
                                     .catch(error => reject(error))
                             }
                         }).catch(error => reject(error))
+                    }).catch(error => reject(error))
+                }).catch(error => reject(error))
+            });
+        },
+
+        //merge all UTXOs of a given floID into a single UTXO
+        mergeUTXOs: function(floID, privKey, floData = '') {
+            return new Promise((resolve, reject) => {
+                if (!floCrypto.validateAddr(floID))
+                    return reject(`Invalid floID`);
+                if (!floCrypto.verifyPrivKey(privKey, floID))
+                    return reject("Invalid Private Key");
+                if (!floCrypto.validateASCII(floData))
+                    return reject("Invalid FLO_Data: only printable ASCII characters are allowed");
+                var trx = bitjs.transaction();
+                var utxoAmt = 0.0;
+                var fee = floGlobals.fee;
+                this.promisedAPI(`api/addr/${floID}/utxo`).then(utxos => {
+                    for (var i = utxos.length - 1; i >= 0; i--)
+                        if (utxos[i].confirmations) {
+                            trx.addinput(utxos[i].txid, utxos[i].vout, utxos[i].scriptPubKey);
+                            utxoAmt += utxos[i].amount;
+                        }
+                    trx.addoutput(floID, utxoAmt - fee);
+                    trx.addflodata(floData.replace(/\n/g, ' '));
+                    var signedTxHash = trx.sign(privKey, 1);
+                    this.broadcastTx(signedTxHash)
+                        .then(txid => resolve(txid))
+                        .catch(error => reject(error))
+                }).catch(error => reject(error))
+            })
+        },
+
+        /**Write data into blockchain from (and/or) to multiple floID
+         * @param  {Array} senderPrivKeys List of sender private-keys
+         * @param  {string} data FLO data of the txn
+         * @param  {Array} receivers List of receivers
+         * @param  {boolean} preserveRatio (optional) preserve ratio or equal contribution
+         * @return {Promise}
+         */
+        writeDataMultiple: function(senderPrivKeys, data, receivers = [floGlobals.adminID], preserveRatio = true) {
+            return new Promise((resolve, reject) => {
+                if (!Array.isArray(senderPrivKeys))
+                    return reject("Invalid senderPrivKeys: SenderPrivKeys must be Array");
+                if (!preserveRatio) {
+                    let tmp = {};
+                    let amount = (floGlobals.sendAmt * receivers.length) / senderPrivKeys.length;
+                    senderPrivKeys.forEach(key => tmp[key] = amount);
+                    senderPrivKeys = tmp;
+                }
+                if (!Array.isArray(receivers))
+                    return reject("Invalid receivers: Receivers must be Array");
+                else {
+                    let tmp = {};
+                    let amount = floGlobals.sendAmt;
+                    receivers.forEach(floID => tmp[floID] = amount);
+                    receivers = tmp
+                }
+                if (typeof data != "string")
+                    data = JSON.stringify(data);
+                this.sendTxMultiple(senderPrivKeys, receivers, data)
+                    .then(txid => resolve(txid))
+                    .catch(error => reject(error))
+            })
+        },
+
+        /**Send Tx from (and/or) to multiple floID
+         * @param  {Array or Object} senderPrivKeys List of sender private-key (optional: with coins to be sent)
+         * @param  {Object} receivers List of receivers with respective amount to be sent
+         * @param  {string} floData FLO data of the txn
+         * @return {Promise}
+         */
+        sendTxMultiple: function(senderPrivKeys, receivers, floData = '') {
+            return new Promise((resolve, reject) => {
+                if (!floCrypto.validateASCII(floData))
+                    return reject("Invalid FLO_Data: only printable ASCII characters are allowed");
+                let senders = {},
+                    preserveRatio;
+                //check for argument validations
+                try {
+                    let invalids = {
+                        InvalidSenderPrivKeys: [],
+                        InvalidSenderAmountFor: [],
+                        InvalidReceiverIDs: [],
+                        InvalidReceiveAmountFor: []
                     }
-                });
-            },
-
-            //merge all UTXOs of a given floID into a single UTXO
-            mergeUTXOs: function (floID, privKey, floData = '') {
-                return new Promise((resolve, reject) => {
-                    if (!floCrypto.validateAddr(floID))
-                        return reject(`Invalid floID`);
-                    if (!floCrypto.verifyPrivKey(privKey, floID))
-                        return reject("Invalid Private Key")
-                    if (!floCrypto.validateASCII(floData))
-                        return reject("Invalid FLO_Data: only printable ASCII characters are allowed");
-
-                    var trx = bitjs.transaction();
-                    var utxoAmt = 0.0;
-                    var fee = floGlobals.fee;
-                    this.promisedAPI(`api/addr/${floID}/utxo`).then(utxos => {
-                        for (var i = utxos.length - 1; i >= 0; i--) {
-                            if (utxos[i].confirmations) {
-                                trx.addinput(utxos[i].txid, utxos[i].vout, utxos[i]
-                                    .scriptPubKey)
-                                utxoAmt += utxos[i].amount;
+                    let inputVal = 0,
+                        outputVal = 0;
+                    //Validate sender privatekeys (and send amount if passed)
+                    //conversion when only privateKeys are passed (preserveRatio mode)
+                    if (Array.isArray(senderPrivKeys)) {
+                        senderPrivKeys.forEach(key => {
+                            try {
+                                if (!key)
+                                    invalids.InvalidSenderPrivKeys.push(key);
+                                else {
+                                    let floID = floCrypto.getFloID(key);
+                                    senders[floID] = {
+                                        wif: key
+                                    }
+                                }
+                            } catch (error) {
+                                invalids.InvalidSenderPrivKeys.push(key)
+                            }
+                        })
+                        preserveRatio = true;
+                    }
+                    //conversion when privatekeys are passed with send amount
+                    else {
+                        for (let key in senderPrivKeys) {
+                            try {
+                                if (!key)
+                                    invalids.InvalidSenderPrivKeys.push(key);
+                                else {
+                                    if (typeof senderPrivKeys[key] !== 'number' || senderPrivKeys[key] <= 0)
+                                        invalids.InvalidSenderAmountFor.push(key);
+                                    else
+                                        inputVal += senderPrivKeys[key];
+                                    let floID = floCrypto.getFloID(key);
+                                    senders[floID] = {
+                                        wif: key,
+                                        coins: senderPrivKeys[key]
+                                    }
+                                }
+                            } catch (error) {
+                                invalids.InvalidSenderPrivKeys.push(key)
                             }
                         }
-                        trx.addoutput(floID, utxoAmt - fee);
+                        preserveRatio = false;
+                    }
+                    //Validate the receiver IDs and receive amount
+                    for (let floID in receivers) {
+                        if (!floCrypto.validateAddr(floID))
+                            invalids.InvalidReceiverIDs.push(floID);
+                        if (typeof receivers[floID] !== 'number' || receivers[floID] <= 0)
+                            invalids.InvalidReceiveAmountFor.push(floID);
+                        else
+                            outputVal += receivers[floID];
+                    }
+                    //Reject if any invalids are found
+                    for (let i in invalids)
+                        if (!invalids[i].length)
+                            delete invalids[i];
+                    if (Object.keys(invalids).length)
+                        return reject(invalids);
+                    //Reject if given inputVal and outputVal are not equal
+                    if (!preserveRatio && inputVal != outputVal)
+                        return reject(`Input Amount (${inputVal}) not equal to Output Amount (${outputVal})`);
+                } catch (error) {
+                    return reject(error)
+                }
+                //Get balance of senders
+                let promises = [];
+                for (let floID in senders)
+                    promises.push(this.getBalance(floID));
+                Promise.all(promises).then(results => {
+                    let totalBalance = 0,
+                        totalFee = floGlobals.fee,
+                        balance = {};
+                    //Divide fee among sender if not for preserveRatio
+                    if (!preserveRatio)
+                        var dividedFee = totalFee / Object.keys(senders).length;
+                    //Check if balance of each sender is sufficient enough
+                    let insufficient = [];
+                    for (let floID in senders) {
+                        balance[floID] = parseFloat(results.shift());
+                        if (isNaN(balance[floID]) || (preserveRatio && balance[floID] <= totalFee) ||
+                            (!preserveRatio && balance[floID] < senders[floID].coins + dividedFee))
+                            insufficient.push(floID);
+                        totalBalance += balance[floID];
+                    }
+                    if (insufficient.length)
+                        return reject({
+                            InsufficientBalance: insufficient
+                        })
+                    //Calculate totalSentAmount and check if totalBalance is sufficient
+                    let totalSendAmt = totalFee;
+                    for (floID in receivers)
+                        totalSendAmt += receivers[floID];
+                    if (totalBalance < totalSendAmt)
+                        return reject("Insufficient total Balance");
+                    //Get the UTXOs of the senders
+                    let promises = [];
+                    for (floID in senders)
+                        promises.push(this.promisedAPI(`api/addr/${floID}/utxo`));
+                    Promise.all(promises).then(results => {
+                        let wifSeq = [];
+                        var trx = bitjs.transaction();
+                        for (floID in senders) {
+                            let utxos = results.shift();
+                            let sendAmt;
+                            if (preserveRatio) {
+                                let ratio = (balance[floID] / totalBalance);
+                                sendAmt = totalSendAmt * ratio;
+                            } else
+                                sendAmt = senders[floID].coins + dividedFee;
+                            let wif = senders[floID].wif;
+                            let utxoAmt = 0.0;
+                            for (let i = utxos.length - 1;
+                                (i >= 0) && (utxoAmt < sendAmt); i--) {
+                                if (utxos[i].confirmations) {
+                                    trx.addinput(utxos[i].txid, utxos[i].vout, utxos[i].scriptPubKey);
+                                    wifSeq.push(wif);
+                                    utxoAmt += utxos[i].amount;
+                                }
+                            }
+                            if (utxoAmt < sendAmt)
+                                return reject("Insufficient balance:" + floID);
+                            let change = (utxoAmt - sendAmt);
+                            if (change > 0)
+                                trx.addoutput(floID, change);
+                        }
+                        for (floID in receivers)
+                            trx.addoutput(floID, receivers[floID]);
                         trx.addflodata(floData.replace(/\n/g, ' '));
-                        var signedTxHash = trx.sign(privKey, 1);
+                        for (let i = 0; i < wifSeq.length; i++)
+                            trx.signinput(i, wifSeq[i], 1);
+                        var signedTxHash = trx.serialize();
                         this.broadcastTx(signedTxHash)
                             .then(txid => resolve(txid))
                             .catch(error => reject(error))
                     }).catch(error => reject(error))
-                })
-            },
+                }).catch(error => reject(error))
+            })
+        },
 
-            /**Write data into blockchain from (and/or) to multiple floID
-             * @param  {Array} senderPrivKeys List of sender private-keys
-             * @param  {string} data FLO data of the txn
-             * @param  {Array} receivers List of receivers
-             * @param  {boolean} preserveRatio (optional) preserve ratio or equal contribution
-             * @return {Promise}
-             */
-            writeDataMultiple: function (senderPrivKeys, data, receivers = [floGlobals.adminID], preserveRatio = true) {
-                return new Promise((resolve, reject) => {
-                    if (!Array.isArray(senderPrivKeys))
-                        return reject("Invalid senderPrivKeys: SenderPrivKeys must be Array")
-                    if (!preserveRatio) {
-                        let tmp = {};
-                        let amount = (floGlobals.sendAmt * receivers.length) / senderPrivKeys.length;
-                        senderPrivKeys.forEach(key => tmp[key] = amount);
-                        senderPrivKeys = tmp
+        //Broadcast signed Tx in blockchain using API
+        broadcastTx: function(signedTxHash) {
+            return new Promise((resolve, reject) => {
+                var request = new XMLHttpRequest();
+                var url = this.util.serverList[this.util.curPos] + 'api/tx/send';
+                console.log(url);
+                if (signedTxHash.length < 1)
+                    reject("Empty Signature");
+                else {
+                    var params = `{"rawtx":"${signedTxHash}"}`;
+                    request.open('POST', url, true);
+                    //Send the proper header information along with the request
+                    request.setRequestHeader('Content-type', 'application/json');
+                    request.onload = function() {
+                        if (request.readyState == 4 && request.status == 200) {
+                            console.log(request.response);
+                            resolve(JSON.parse(request.response).txid.result);
+                        } else
+                            reject(request.responseText);
                     }
-                    if (!Array.isArray(receivers))
-                        return reject("Invalid receivers: Receivers must be Array")
-                    else {
-                        let tmp = {};
-                        let amount = floGlobals.sendAmt;
-                        receivers.forEach(floID => tmp[floID] = amount);
-                        receivers = tmp
-                    }
-                    if (typeof data != "string")
-                        data = JSON.stringify(data);
-                    this.sendTxMultiple(senderPrivKeys, receivers, data)
-                        .then(txid => resolve(txid))
-                        .catch(error => reject(error))
-                })
-            },
+                    request.send(params);
+                }
+            })
+        },
 
-            /**Send Tx from (and/or) to multiple floID
-             * @param  {Array or Object} senderPrivKeys List of sender private-key (optional: with coins to be sent)
-             * @param  {Object} receivers List of receivers with respective amount to be sent
-             * @param  {string} floData FLO data of the txn
-             * @return {Promise}
-             */
-            sendTxMultiple: function (senderPrivKeys, receivers, floData = '') {
-                return new Promise((resolve, reject) => {
-                    if (!floCrypto.validateASCII(floData))
-                        return reject("Invalid FLO_Data: only printable ASCII characters are allowed");
-                    let senders = {},
-                        preserveRatio;
-                    //check for argument validations
-                    try {
-                        let invalids = {
-                            InvalidSenderPrivKeys: [],
-                            InvalidSenderAmountFor: [],
-                            InvalidReceiverIDs: [],
-                            InvalidReceiveAmountFor: []
-                        }
-                        let inputVal = 0,
-                            outputVal = 0;
-                        //Validate sender privatekeys (and send amount if passed)
-                        //conversion when only privateKeys are passed (preserveRatio mode)
-                        if (Array.isArray(senderPrivKeys)) {
-                            senderPrivKeys.forEach(key => {
-                                try {
-                                    if (!key)
-                                        invalids.InvalidSenderPrivKeys.push(key);
-                                    else {
-                                        let floID = floCrypto.getFloID(key);
-                                        senders[floID] = {
-                                            wif: key
-                                        }
-                                    }
-                                } catch (error) {
-                                    invalids.InvalidSenderPrivKeys.push(key)
-                                }
-                            })
-                            preserveRatio = true;
-                        }
-                        //conversion when privatekeys are passed with send amount
-                        else {
-                            for (let key in senderPrivKeys) {
-                                try {
-                                    if (!key)
-                                        invalids.InvalidSenderPrivKeys.push(key);
-                                    else {
-                                        if (typeof senderPrivKeys[key] !== 'number' || senderPrivKeys[
-                                            key] <= 0)
-                                            invalids.InvalidSenderAmountFor.push(key)
-                                        else
-                                            inputVal += senderPrivKeys[key];
-                                        let floID = floCrypto.getFloID(key);
-                                        senders[floID] = {
-                                            wif: key,
-                                            coins: senderPrivKeys[key]
-                                        }
-                                    }
-                                } catch (error) {
-                                    invalids.InvalidSenderPrivKeys.push(key)
-                                }
-                            }
-                            preserveRatio = false;
-                        }
-                        //Validate the receiver IDs and receive amount
-                        for (let floID in receivers) {
-                            if (!floCrypto.validateAddr(floID))
-                                invalids.InvalidReceiverIDs.push(floID)
-                            if (typeof receivers[floID] !== 'number' || receivers[floID] <= 0)
-                                invalids.InvalidReceiveAmountFor.push(floID)
-                            else
-                                outputVal += receivers[floID];
-                        }
-                        //Reject if any invalids are found
-                        for (let i in invalids)
-                            if (!invalids[i].length)
-                                delete invalids[i];
-                        if (Object.keys(invalids).length)
-                            return reject(invalids);
-                        //Reject if given inputVal and outputVal are not equal
-                        if (!preserveRatio && inputVal != outputVal)
-                            return reject(
-                                `Input Amount (${inputVal}) not equal to Output Amount (${outputVal})`)
-                    } catch (error) {
-                        return reject(error)
-                    }
-                    //Get balance of senders
-                    let promises = []
-                    for (let floID in senders)
-                        promises.push(this.getBalance(floID))
-                    Promise.all(promises).then(results => {
-                        let totalBalance = 0,
-                            totalFee = floGlobals.fee,
-                            balance = {};
-                        //Divide fee among sender if not for preserveRatio
-                        if (!preserveRatio)
-                            var dividedFee = totalFee / Object.keys(senders).length;
-                        //Check if balance of each sender is sufficient enough
-                        let insufficient = [];
-                        for (let floID in senders) {
-                            balance[floID] = parseFloat(results.shift());
-                            if (isNaN(balance[floID]) || (preserveRatio && balance[floID] <=
-                                totalFee) || (!preserveRatio && balance[floID] < senders[floID]
-                                    .coins + dividedFee))
-                                insufficient.push(floID)
-                            totalBalance += balance[floID];
-                        }
-                        if (insufficient.length)
-                            return reject({
-                                InsufficientBalance: insufficient
-                            })
-                        //Calculate totalSentAmount and check if totalBalance is sufficient
-                        let totalSendAmt = totalFee;
-                        for (floID in receivers)
-                            totalSendAmt += receivers[floID];
-                        if (totalBalance < totalSendAmt)
-                            return reject("Insufficient total Balance")
-                        //Get the UTXOs of the senders
-                        let promises = []
-                        for (floID in senders)
-                            promises.push(this.promisedAPI(`api/addr/${floID}/utxo`))
-                        Promise.all(promises).then(results => {
-                            let wifSeq = [];
-                            var trx = bitjs.transaction();
-                            for (floID in senders) {
-                                let utxos = results.shift();
-                                let sendAmt;
-                                if (preserveRatio) {
-                                    let ratio = (balance[floID] / totalBalance);
-                                    sendAmt = totalSendAmt * ratio;
-                                } else
-                                    sendAmt = senders[floID].coins + dividedFee;
-                                let wif = senders[floID].wif;
-                                let utxoAmt = 0.0;
-                                for (let i = utxos.length - 1;
-                                    (i >= 0) && (utxoAmt < sendAmt); i--) {
-                                    if (utxos[i].confirmations) {
-                                        trx.addinput(utxos[i].txid, utxos[i].vout, utxos[i]
-                                            .scriptPubKey)
-                                        wifSeq.push(wif);
-                                        utxoAmt += utxos[i].amount;
-                                    }
-                                }
-                                if (utxoAmt < sendAmt)
-                                    return reject("Insufficient balance:" + floID);
-                                let change = (utxoAmt - sendAmt);
-                                if (change > 0)
-                                    trx.addoutput(floID, change);
-                            }
-                            for (floID in receivers)
-                                trx.addoutput(floID, receivers[floID]);
-                            trx.addflodata(floData.replace(/\n/g, ' '));
-                            for (let i = 0; i < wifSeq.length; i++)
-                                trx.signinput(i, wifSeq[i], 1);
-                            var signedTxHash = trx.serialize();
-                            this.broadcastTx(signedTxHash)
-                                .then(txid => resolve(txid))
-                                .catch(error => reject(error))
-                        }).catch(error => reject(error))
-                    }).catch(error => reject(error))
-                })
-            },
+        getTx: function(txid) {
+            return new Promise((resolve, reject) => {
+                this.promisedAPI(`api/tx/${txid}`)
+                    .then(response => resolve(response))
+                    .catch(error => reject(error))
+            })
+        },
 
-            //Broadcast signed Tx in blockchain using API
-            broadcastTx: function (signedTxHash) {
-                return new Promise((resolve, reject) => {
-                    var request = new XMLHttpRequest();
-                    var url = this.util.serverList[this.util.curPos] + 'api/tx/send';
-                    console.log(url)
-                    if (signedTxHash.length < 1)
-                        reject("Empty Signature");
-                    else {
-                        var params = `{"rawtx":"${signedTxHash}"}`;
-                        request.open('POST', url, true);
-                        //Send the proper header information along with the request
-                        request.setRequestHeader('Content-type', 'application/json');
-                        request.onload = function () {
-                            if (request.readyState == 4 && request.status == 200) {
-                                console.log(request.response);
-                                resolve(JSON.parse(request.response).txid.result);
-                            } else
-                                reject(request.responseText);
-                        }
-                        request.send(params);
-                    }
-                })
-            },
+        //Read Txs of Address between from and to
+        readTxs: function(addr, from, to) {
+            return new Promise((resolve, reject) => {
+                this.promisedAPI(`api/addrs/${addr}/txs?from=${from}&to=${to}`)
+                    .then(response => resolve(response))
+                    .catch(error => reject(error))
+            });
+        },
 
-            getTx: function (txid) {
-                return new Promise((resolve, reject) => {
-                    this.promisedAPI(`api/tx/${txid}`)
-                        .then(response => resolve(response))
-                        .catch(error => reject(error))
-                })
-            },
+        //Read All Txs of Address (newest first)
+        readAllTxs: function(addr) {
+            return new Promise((resolve, reject) => {
+                this.promisedAPI(`api/addrs/${addr}/txs?from=0&to=1`).then(response => {
+                    this.promisedAPI(`api/addrs/${addr}/txs?from=0&to=${response.totalItems}0`)
+                        .then(response => resolve(response.items))
+                        .catch(error => reject(error));
+                }).catch(error => reject(error))
+            });
+        },
 
-            //Read Txs of Address between from and to
-            readTxs: function (addr, from, to) {
-                return new Promise((resolve, reject) => {
-                    this.promisedAPI(`api/addrs/${addr}/txs?from=${from}&to=${to}`)
-                        .then(response => resolve(response))
-                        .catch(error => reject(error))
-                });
-            },
-
-            //Read All Txs of Address (newest first)
-            readAllTxs: function (addr) {
-                return new Promise((resolve, reject) => {
-                    this.promisedAPI(`api/addrs/${addr}/txs?from=0&to=1`).then(response => {
-                        this.promisedAPI(`api/addrs/${addr}/txs?from=0&to=${response.totalItems}0`)
-                            .then(response => resolve(response.items))
-                            .catch(error => reject(error));
-                    }).catch(error => reject(error))
-                });
-            },
-
-            /*Read flo Data from txs of given Address
-            options can be used to filter data
-            limit       : maximum number of filtered data (default = 1000, negative  = no limit)
-            ignoreOld   : ignore old txs (default = 0)
-            sentOnly    : filters only sent data
-            receivedOnly: filters only received data
-            pattern     : filters data that with JSON pattern
-            filter      : custom filter funtion for floData (eg . filter: d => {return d[0] == '$'})
-            txid        : (boolean) resolve txid or not
-            sender      : flo-id(s) of sender
-            receiver    : flo-id(s) of receiver
-            */
-            readData: function (addr, options = {}) {
-                options.limit = options.limit || 0
-                options.ignoreOld = options.ignoreOld || 0
-                if (typeof options.sender === "string") options.sender = [options.sender];
-                if (typeof options.receiver === "string") options.receiver = [options.receiver];
-                return new Promise((resolve, reject) => {
-                    this.promisedAPI(`api/addrs/${addr}/txs?from=0&to=1`).then(response => {
-                        var newItems = response.totalItems - options.ignoreOld;
-                        this.promisedAPI(`api/addrs/${addr}/txs?from=0&to=${newItems * 2}`).then(
-                            response => {
-                                if (options.limit <= 0)
-                                    options.limit = response.items.length;
-                                var filteredData = [];
-                                for (i = 0; i < (response.totalItems - options.ignoreOld) &&
-                                    filteredData.length < options.limit; i++) {
-                                    if (options.pattern) {
-                                        try {
-                                            let jsonContent = JSON.parse(response.items[i].floData)
-                                            if (!Object.keys(jsonContent).includes(options.pattern))
-                                                continue;
-                                        } catch (error) {
+        /*Read flo Data from txs of given Address
+        options can be used to filter data
+        limit       : maximum number of filtered data (default = 1000, negative  = no limit)
+        ignoreOld   : ignore old txs (default = 0)
+        sentOnly    : filters only sent data
+        receivedOnly: filters only received data
+        pattern     : filters data that with JSON pattern
+        filter      : custom filter funtion for floData (eg . filter: d => {return d[0] == '$'})
+        tx          : (boolean) resolve tx data or not (resolves an Array of Object with tx details)
+        sender      : flo-id(s) of sender
+        receiver    : flo-id(s) of receiver
+        */
+        readData: function(addr, options = {}) {
+            options.limit = options.limit || 0;
+            options.ignoreOld = options.ignoreOld || 0;
+            if (typeof options.sender === "string") options.sender = [options.sender];
+            if (typeof options.receiver === "string") options.receiver = [options.receiver];
+            return new Promise((resolve, reject) => {
+                this.promisedAPI(`api/addrs/${addr}/txs?from=0&to=1`).then(response => {
+                    var newItems = response.totalItems - options.ignoreOld;
+                    this.promisedAPI(`api/addrs/${addr}/txs?from=0&to=${newItems*2}`).then(response => {
+                            if (options.limit <= 0)
+                                options.limit = response.items.length;
+                            var filteredData = [];
+                            for (let i = 0; i < (response.totalItems - options.ignoreOld) && filteredData.length < options.limit; i++) {
+                                if (options.pattern) {
+                                    try {
+                                        let jsonContent = JSON.parse(response.items[i].floData);
+                                        if (!Object.keys(jsonContent).includes(options.pattern))
                                             continue;
-                                        }
-                                    }
-                                    if (options.sentOnly) {
-                                        let flag = false;
-                                        for (let vin of response.items[i].vin)
-                                            if (vin.addr === addr) {
-                                                flag = true;
-                                                break;
-                                            }
-                                        if (!flag) continue;
-                                    }
-                                    if (Array.isArray(options.sender)) {
-                                        let flag = false;
-                                        for (let vin of response.items[i].vin)
-                                            if (options.sender.includes(vin.addr)) {
-                                                flag = true;
-                                                break;
-                                            }
-                                        if (!flag) continue;
-                                    }
-                                    if (options.receivedOnly) {
-                                        let flag = false;
-                                        for (let vout of response.items[i].vout)
-                                            if (vout.scriptPubKey.addresses[0] === addr) {
-                                                flag = true;
-                                                break;
-                                            }
-                                        if (!flag) continue;
-                                    }
-                                    if (Array.isArray(options.receiver)) {
-                                        let flag = false;
-                                        for (let vout of response.items[i].vout)
-                                            if (options.receiver.includes(vout.scriptPubKey.addresses[0])) {
-                                                flag = true;
-                                                break;
-                                            }
-                                        if (!flag) continue;
-                                    }
-                                    if (options.filter && !options.filter(response.items[i].floData))
+                                    } catch (error) {
                                         continue;
-                                    filteredData.push(options.txid ? [response.items[i].txid, response.items[i].floData] : response.items[i].floData);
+                                    }
                                 }
-                                resolve({
-                                    totalTxs: response.totalItems,
-                                    data: filteredData
-                                });
-                            }).catch(error => {
-                                reject(error);
+                                if (options.sentOnly) {
+                                    let flag = false;
+                                    for (let vin of response.items[i].vin)
+                                        if (vin.addr === addr) {
+                                            flag = true;
+                                            break;
+                                        }
+                                    if (!flag) continue;
+                                }
+                                if (Array.isArray(options.sender)) {
+                                    let flag = false;
+                                    for (let vin of response.items[i].vin)
+                                        if (options.sender.includes(vin.addr)) {
+                                            flag = true;
+                                            break;
+                                        }
+                                    if (!flag) continue;
+                                }
+                                if (options.receivedOnly) {
+                                    let flag = false;
+                                    for (let vout of response.items[i].vout)
+                                        if (vout.scriptPubKey.addresses[0] === addr) {
+                                            flag = true;
+                                            break;
+                                        }
+                                    if (!flag) continue;
+                                }
+                                if (Array.isArray(options.receiver)) {
+                                    let flag = false;
+                                    for (let vout of response.items[i].vout)
+                                        if (options.receiver.includes(vout.scriptPubKey.addresses[0])) {
+                                            flag = true;
+                                            break;
+                                        }
+                                    if (!flag) continue;
+                                }
+                                if (options.filter && !options.filter(response.items[i].floData))
+                                    continue;
+
+                                if (options.tx) {
+                                    let d = {}
+                                    d.txid = response.items[i].txid;
+                                    d.time = response.items[i].time;
+                                    d.blockheight = response.items[i].blockheight;
+                                    d.data = response.items[i].floData;
+                                    filteredData.push(d);
+                                } else
+                                    filteredData.push(response.items[i].floData);
+                            }
+                            resolve({
+                                totalTxs: response.totalItems,
+                                data: filteredData
                             });
-                    }).catch(error => {
+                        }).catch(error => {
                         reject(error);
                     });
+                }).catch(error => {
+                    reject(error);
                 });
-            }
+            });
         }
-    </script>
-    <script id="compactIDB" version="2.0.1">
-        /* Compact IndexedDB operations */
+    }
+</script>
+<script id="compactIDB" version="2.0.1">
+    /* Compact IndexedDB operations */
 
-        window.indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
-        window.IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction || window.msIDBTransaction;
-        window.IDBKeyRange = window.IDBKeyRange || window.webkitIDBKeyRange || window.msIDBKeyRange;
+    window.indexedDB = window.indexedDB || window.mozIndexedDB || window.webkitIndexedDB || window.msIndexedDB;
+    window.IDBTransaction = window.IDBTransaction || window.webkitIDBTransaction || window.msIDBTransaction;
+    window.IDBKeyRange = window.IDBKeyRange || window.webkitIDBKeyRange || window.msIDBKeyRange;
 
-        if (!window.indexedDB)
-            window.alert("Your browser doesn't support a stable version of IndexedDB.")
+    if (!window.indexedDB)
+        window.alert("Your browser doesn't support a stable version of IndexedDB.")
 
-        const compactIDB = {
+    const compactIDB = {
 
-            setDefaultDB: function (dbName) {
-                this.defaultDB = dbName;
-            },
+        setDefaultDB: function (dbName) {
+            this.defaultDB = dbName;
+        },
 
-            upgradeDB: function (dbName, createList = null, deleteList = null) {
-                return new Promise((resolve, reject) => {
-                    this.getDBversion(dbName).then(version => {
-                        var idb = indexedDB.open(dbName, version + 1);
-                        idb.onerror = (event) => reject("Error in opening IndexedDB");
-                        idb.onupgradeneeded = (event) => {
-                            let db = event.target.result;
-                            if (createList instanceof Object) {
-                                if (Array.isArray(createList)) {
-                                    let tmp = {}
-                                    createList.forEach(o => tmp[o] = {})
-                                    createList = tmp
-                                }
-                                for (let o in createList) {
-                                    let obs = db.createObjectStore(o, createList[o].options ||
-                                        {});
-                                    if (createList[o].indexes instanceof Object)
-                                        for (let i in createList[o].indexes)
-                                            obs.createIndex(i, i, createList[o].indexes || {});
-                                }
-                            }
-                            if (Array.isArray(deleteList))
-                                deleteList.forEach(o => db.deleteObjectStore(o));
-                            resolve('Database upgraded')
-                        }
-                        idb.onsuccess = (event) => event.target.result.close();
-                    }).catch(error => reject(error))
-                })
-            },
-
-            initDB: function (dbName, objectStores = {}) {
-                return new Promise((resolve, reject) => {
-                    if (!(objectStores instanceof Object))
-                        return reject('ObjectStores must be an object or array')
-                    this.defaultDB = this.defaultDB || dbName;
-                    var idb = indexedDB.open(dbName);
-                    idb.onerror = (event) => reject("Error in opening IndexedDB");
-                    idb.onsuccess = (event) => {
-                        var db = event.target.result;
-                        let cList = Object.values(db.objectStoreNames);
-                        var obs = {},
-                            a_obs = {},
-                            d_obs = [];
-                        if (!Array.isArray(objectStores))
-                            var obs = objectStores
-                        else
-                            objectStores.forEach(o => obs[o] = {})
-                        let nList = Object.keys(obs)
-                        for (let o of nList)
-                            if (!cList.includes(o))
-                                a_obs[o] = obs[o]
-                        for (let o of cList)
-                            if (!nList.includes(o))
-                                d_obs.push(o)
-                        if (!Object.keys(a_obs).length && !d_obs.length)
-                            resolve("Initiated IndexedDB");
-                        else
-                            this.upgradeDB(dbName, a_obs, d_obs)
-                                .then(result => resolve(result))
-                                .catch(error => reject(error))
-                        db.close();
-                    }
-                });
-            },
-
-            openDB: function (dbName = this.defaultDB) {
-                return new Promise((resolve, reject) => {
-                    var idb = indexedDB.open(dbName);
+        upgradeDB: function (dbName, createList = null, deleteList = null) {
+            return new Promise((resolve, reject) => {
+                this.getDBversion(dbName).then(version => {
+                    var idb = indexedDB.open(dbName, version + 1);
                     idb.onerror = (event) => reject("Error in opening IndexedDB");
                     idb.onupgradeneeded = (event) => {
-                        event.target.result.close();
-                        this.deleteDB(dbName)
-                        reject("Datebase not found")
+                        let db = event.target.result;
+                        if (createList instanceof Object) {
+                            if (Array.isArray(createList)) {
+                                let tmp = {}
+                                createList.forEach(o => tmp[o] = {})
+                                createList = tmp
+                            }
+                            for (let o in createList) {
+                                let obs = db.createObjectStore(o, createList[o].options ||
+                                    {});
+                                if (createList[o].indexes instanceof Object)
+                                    for (let i in createList[o].indexes)
+                                        obs.createIndex(i, i, createList[o].indexes || {});
+                            }
+                        }
+                        if (Array.isArray(deleteList))
+                            deleteList.forEach(o => db.deleteObjectStore(o));
+                        resolve('Database upgraded')
                     }
-                    idb.onsuccess = (event) => resolve(event.target.result);
-                });
-            },
+                    idb.onsuccess = (event) => event.target.result.close();
+                }).catch(error => reject(error))
+            })
+        },
 
-            deleteDB: function (dbName = this.defaultDB) {
-                return new Promise((resolve, reject) => {
-                    var deleteReq = indexedDB.deleteDatabase(dbName);;
-                    deleteReq.onerror = (event) => reject("Error deleting database!");
-                    deleteReq.onsuccess = (event) => resolve("Database deleted successfully");
-                });
-            },
+        initDB: function (dbName, objectStores = {}) {
+            return new Promise((resolve, reject) => {
+                if (!(objectStores instanceof Object))
+                    return reject('ObjectStores must be an object or array')
+                this.defaultDB = this.defaultDB || dbName;
+                var idb = indexedDB.open(dbName);
+                idb.onerror = (event) => reject("Error in opening IndexedDB");
+                idb.onsuccess = (event) => {
+                    var db = event.target.result;
+                    let cList = Object.values(db.objectStoreNames);
+                    var obs = {},
+                        a_obs = {},
+                        d_obs = [];
+                    if (!Array.isArray(objectStores))
+                        var obs = objectStores
+                    else
+                        objectStores.forEach(o => obs[o] = {})
+                    let nList = Object.keys(obs)
+                    for (let o of nList)
+                        if (!cList.includes(o))
+                            a_obs[o] = obs[o]
+                    for (let o of cList)
+                        if (!nList.includes(o))
+                            d_obs.push(o)
+                    if (!Object.keys(a_obs).length && !d_obs.length)
+                        resolve("Initiated IndexedDB");
+                    else
+                        this.upgradeDB(dbName, a_obs, d_obs)
+                        .then(result => resolve(result))
+                        .catch(error => reject(error))
+                    db.close();
+                }
+            });
+        },
 
-            getDBversion: function (dbName = this.defaultDB) {
-                return new Promise((resolve, reject) => {
-                    this.openDB(dbName).then(db => {
-                        resolve(db.version)
-                        db.close()
-                    }).catch(error => reject(error))
-                })
-            },
+        openDB: function (dbName = this.defaultDB) {
+            return new Promise((resolve, reject) => {
+                var idb = indexedDB.open(dbName);
+                idb.onerror = (event) => reject("Error in opening IndexedDB");
+                idb.onupgradeneeded = (event) => {
+                    event.target.result.close();
+                    this.deleteDB(dbName)
+                    reject("Datebase not found")
+                }
+                idb.onsuccess = (event) => resolve(event.target.result);
+            });
+        },
 
-            writeData: function (obsName, data, key = false, dbName = this.defaultDB) {
-                return new Promise((resolve, reject) => {
-                    this.openDB(dbName).then(db => {
-                        var obs = db.transaction(obsName, "readwrite").objectStore(obsName);
-                        let writeReq = (key ? obs.put(data, key) : obs.put(data));
-                        writeReq.onsuccess = (evt) => resolve(`Write data Successful`);
-                        writeReq.onerror = (evt) => reject(
-                            `Write data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
-                        );
-                        db.close();
-                    }).catch(error => reject(error));
-                });
-            },
+        deleteDB: function (dbName = this.defaultDB) {
+            return new Promise((resolve, reject) => {
+                var deleteReq = indexedDB.deleteDatabase(dbName);;
+                deleteReq.onerror = (event) => reject("Error deleting database!");
+                deleteReq.onsuccess = (event) => resolve("Database deleted successfully");
+            });
+        },
 
-            addData: function (obsName, data, key = false, dbName = this.defaultDB) {
-                return new Promise((resolve, reject) => {
-                    this.openDB(dbName).then(db => {
-                        var obs = db.transaction(obsName, "readwrite").objectStore(obsName);
-                        let addReq = (key ? obs.add(data, key) : obs.add(data));
-                        addReq.onsuccess = (evt) => resolve(`Add data successful`);
-                        addReq.onerror = (evt) => reject(
-                            `Add data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
-                        );
-                        db.close();
-                    }).catch(error => reject(error));
-                });
-            },
+        getDBversion: function (dbName = this.defaultDB) {
+            return new Promise((resolve, reject) => {
+                this.openDB(dbName).then(db => {
+                    resolve(db.version)
+                    db.close()
+                }).catch(error => reject(error))
+            })
+        },
 
-            removeData: function (obsName, key, dbName = this.defaultDB) {
-                return new Promise((resolve, reject) => {
-                    this.openDB(dbName).then(db => {
-                        var obs = db.transaction(obsName, "readwrite").objectStore(obsName);
-                        let delReq = obs.delete(key);
-                        delReq.onsuccess = (evt) => resolve(`Removed Data ${key}`);
-                        delReq.onerror = (evt) => reject(
-                            `Remove data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
-                        );
-                        db.close();
-                    }).catch(error => reject(error));
-                });
-            },
+        writeData: function (obsName, data, key = false, dbName = this.defaultDB) {
+            return new Promise((resolve, reject) => {
+                this.openDB(dbName).then(db => {
+                    var obs = db.transaction(obsName, "readwrite").objectStore(obsName);
+                    let writeReq = (key ? obs.put(data, key) : obs.put(data));
+                    writeReq.onsuccess = (evt) => resolve(`Write data Successful`);
+                    writeReq.onerror = (evt) => reject(
+                        `Write data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
+                    );
+                    db.close();
+                }).catch(error => reject(error));
+            });
+        },
 
-            clearData: function (obsName, dbName = this.defaultDB) {
-                return new Promise((resolve, reject) => {
-                    this.openDB(dbName).then(db => {
-                        var obs = db.transaction(obsName, "readwrite").objectStore(obsName);
-                        let clearReq = obs.clear();
-                        clearReq.onsuccess = (evt) => resolve(`Clear data Successful`);
-                        clearReq.onerror = (evt) => reject(`Clear data Unsuccessful`);
-                        db.close();
-                    }).catch(error => reject(error));
-                });
-            },
+        addData: function (obsName, data, key = false, dbName = this.defaultDB) {
+            return new Promise((resolve, reject) => {
+                this.openDB(dbName).then(db => {
+                    var obs = db.transaction(obsName, "readwrite").objectStore(obsName);
+                    let addReq = (key ? obs.add(data, key) : obs.add(data));
+                    addReq.onsuccess = (evt) => resolve(`Add data successful`);
+                    addReq.onerror = (evt) => reject(
+                        `Add data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
+                    );
+                    db.close();
+                }).catch(error => reject(error));
+            });
+        },
 
-            readData: function (obsName, key, dbName = this.defaultDB) {
-                return new Promise((resolve, reject) => {
-                    this.openDB(dbName).then(db => {
-                        var obs = db.transaction(obsName, "readonly").objectStore(obsName);
-                        let getReq = obs.get(key);
-                        getReq.onsuccess = (evt) => resolve(evt.target.result);
-                        getReq.onerror = (evt) => reject(
-                            `Read data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
-                        );
-                        db.close();
-                    }).catch(error => reject(error));
-                });
-            },
+        removeData: function (obsName, key, dbName = this.defaultDB) {
+            return new Promise((resolve, reject) => {
+                this.openDB(dbName).then(db => {
+                    var obs = db.transaction(obsName, "readwrite").objectStore(obsName);
+                    let delReq = obs.delete(key);
+                    delReq.onsuccess = (evt) => resolve(`Removed Data ${key}`);
+                    delReq.onerror = (evt) => reject(
+                        `Remove data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
+                    );
+                    db.close();
+                }).catch(error => reject(error));
+            });
+        },
 
-            readAllData: function (obsName, dbName = this.defaultDB) {
-                return new Promise((resolve, reject) => {
-                    this.openDB(dbName).then(db => {
-                        var obs = db.transaction(obsName, "readonly").objectStore(obsName);
-                        var tmpResult = {}
-                        let curReq = obs.openCursor();
-                        curReq.onsuccess = (evt) => {
-                            var cursor = evt.target.result;
-                            if (cursor) {
-                                tmpResult[cursor.primaryKey] = cursor.value;
+        clearData: function (obsName, dbName = this.defaultDB) {
+            return new Promise((resolve, reject) => {
+                this.openDB(dbName).then(db => {
+                    var obs = db.transaction(obsName, "readwrite").objectStore(obsName);
+                    let clearReq = obs.clear();
+                    clearReq.onsuccess = (evt) => resolve(`Clear data Successful`);
+                    clearReq.onerror = (evt) => reject(`Clear data Unsuccessful`);
+                    db.close();
+                }).catch(error => reject(error));
+            });
+        },
+
+        readData: function (obsName, key, dbName = this.defaultDB) {
+            return new Promise((resolve, reject) => {
+                this.openDB(dbName).then(db => {
+                    var obs = db.transaction(obsName, "readonly").objectStore(obsName);
+                    let getReq = obs.get(key);
+                    getReq.onsuccess = (evt) => resolve(evt.target.result);
+                    getReq.onerror = (evt) => reject(
+                        `Read data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
+                    );
+                    db.close();
+                }).catch(error => reject(error));
+            });
+        },
+
+        readAllData: function (obsName, dbName = this.defaultDB) {
+            return new Promise((resolve, reject) => {
+                this.openDB(dbName).then(db => {
+                    var obs = db.transaction(obsName, "readonly").objectStore(obsName);
+                    var tmpResult = {}
+                    let curReq = obs.openCursor();
+                    curReq.onsuccess = (evt) => {
+                        var cursor = evt.target.result;
+                        if (cursor) {
+                            tmpResult[cursor.primaryKey] = cursor.value;
+                            cursor.continue();
+                        } else
+                            resolve(tmpResult);
+                    }
+                    curReq.onerror = (evt) => reject(
+                        `Read-All data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
+                    );
+                    db.close();
+                }).catch(error => reject(error));
+            });
+        },
+
+        /*searchData: function (obsName, options = {}, dbName = this.defaultDB) {
+            
+            return new Promise((resolve, reject) => {
+                this.openDB(dbName).then(db => {
+                    var obs = db.transaction(obsName, "readonly").objectStore(obsName);
+                    var filteredResult = {}
+                    let keyRange;
+                    if(options.lowerKey!==null && options.upperKey!==null)
+                        keyRange = IDBKeyRange.bound(options.lowerKey, options.upperKey);
+                    else if(options.lowerKey!==null)
+                        keyRange = IDBKeyRange.lowerBound(options.lowerKey);
+                    else if (options.upperKey!==null)
+                        keyRange = IDBKeyRange.upperBound(options.upperBound);
+                    else if (options.atKey)
+                    let curReq = obs.openCursor(keyRange, )
+                }).catch(error => reject(error))
+            })
+        },*/
+
+        searchData: function (obsName, options = {}, dbName = this.defaultDB) {
+            options.lowerKey = options.atKey || options.lowerKey || 0
+            options.upperKey = options.atKey || options.upperKey || false
+            options.patternEval = options.patternEval || ((k, v) => {
+                return true
+            })
+            options.limit = options.limit || false;
+            options.lastOnly = options.lastOnly || false
+            return new Promise((resolve, reject) => {
+                this.openDB(dbName).then(db => {
+                    var obs = db.transaction(obsName, "readonly").objectStore(obsName);
+                    var filteredResult = {}
+                    let curReq = obs.openCursor(
+                        options.upperKey ? IDBKeyRange.bound(options.lowerKey, options.upperKey) : IDBKeyRange.lowerBound(options.lowerKey),
+                        options.lastOnly ? "prev" : "next");
+                    curReq.onsuccess = (evt) => {
+                        var cursor = evt.target.result;
+                        if (cursor) {
+                            if (options.patternEval(cursor.primaryKey, cursor.value)) {
+                                filteredResult[cursor.primaryKey] = cursor.value;
+                                options.lastOnly ? resolve(filteredResult) : cursor.continue();
+                            } else
                                 cursor.continue();
-                            } else
-                                resolve(tmpResult);
-                        }
-                        curReq.onerror = (evt) => reject(
-                            `Read-All data unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`
-                        );
-                        db.close();
-                    }).catch(error => reject(error));
-                });
-            },
-
-            /*searchData: function (obsName, options = {}, dbName = this.defaultDB) {
-                
-                return new Promise((resolve, reject) => {
-                    this.openDB(dbName).then(db => {
-                        var obs = db.transaction(obsName, "readonly").objectStore(obsName);
-                        var filteredResult = {}
-                        let keyRange;
-                        if(options.lowerKey!==null && options.upperKey!==null)
-                            keyRange = IDBKeyRange.bound(options.lowerKey, options.upperKey);
-                        else if(options.lowerKey!==null)
-                            keyRange = IDBKeyRange.lowerBound(options.lowerKey);
-                        else if (options.upperKey!==null)
-                            keyRange = IDBKeyRange.upperBound(options.upperBound);
-                        else if (options.atKey)
-                        let curReq = obs.openCursor(keyRange, )
-                    }).catch(error => reject(error))
-                })
-            },*/
-
-            searchData: function (obsName, options = {}, dbName = this.defaultDB) {
-                options.lowerKey = options.atKey || options.lowerKey || 0
-                options.upperKey = options.atKey || options.upperKey || false
-                options.patternEval = options.patternEval || ((k, v) => {
-                    return true
-                })
-                options.limit = options.limit || false;
-                options.lastOnly = options.lastOnly || false
-                return new Promise((resolve, reject) => {
-                    this.openDB(dbName).then(db => {
-                        var obs = db.transaction(obsName, "readonly").objectStore(obsName);
-                        var filteredResult = {}
-                        let curReq = obs.openCursor(
-                            options.upperKey ? IDBKeyRange.bound(options.lowerKey, options.upperKey) : IDBKeyRange.lowerBound(options.lowerKey),
-                            options.lastOnly ? "prev" : "next");
-                        curReq.onsuccess = (evt) => {
-                            var cursor = evt.target.result;
-                            if (cursor) {
-                                if (options.patternEval(cursor.primaryKey, cursor.value)) {
-                                    filteredResult[cursor.primaryKey] = cursor.value;
-                                    options.lastOnly ? resolve(filteredResult) : cursor.continue();
-                                } else
-                                    cursor.continue();
-                            } else
-                                resolve(filteredResult);
-                        }
-                        curReq.onerror = (evt) => reject(`Search unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`);
-                        db.close();
-                    }).catch(error => reject(error));
-                });
-            }
+                        } else
+                            resolve(filteredResult);
+                    }
+                    curReq.onerror = (evt) => reject(`Search unsuccessful [${evt.target.error.name}] ${evt.target.error.message}`);
+                    db.close();
+                }).catch(error => reject(error));
+            });
         }
-    </script>
-    <script id="floCloudAPI" version="2.0.2e">
-        /* FLO Cloud operations to send/request application data*/
-        const floCloudAPI = {
+    }
+</script>
+<script id="floCloudAPI" version="2.1.0a">
+    /* FLO Cloud operations to send/request application data*/
+    const floCloudAPI = {
 
-            util: {
+        util: {
 
-                kBucket: {
-                    SNKB: null,
-                    SNCO: null,
+            kBucket: {
+                SNKB: null,
+                SNCO: null,
 
-                    util: {
-                        decodeID(floID) {
-                            let k = bitjs.Base58.decode(floID)
-                            k.shift()
-                            k.splice(-4, 4)
-                            const decodedId = Crypto.util.bytesToHex(k);
-                            const nodeIdBigInt = new BigInteger(decodedId, 16);
-                            const nodeIdBytes = nodeIdBigInt.toByteArrayUnsigned();
-                            const nodeIdNewInt8Array = new Uint8Array(nodeIdBytes);
-                            return nodeIdNewInt8Array;
-                        },
-
-                        addNode: function (floID, KB) {
-                            let decodedId = this.decodeID(floID);
-                            const contact = {
-                                id: decodedId,
-                                floID: floID
-                            };
-                            KB.add(contact)
-                        },
-
-                        removeNode: function (floID, KB) {
-                            let decodedId = this.decodeID(floID);
-                            KB.remove(decodedId)
-                        },
-
-                        isPresent: function (floID, KB) {
-                            let kArray = KB.toArray().map(k => k.floID);
-                            return kArray.includes(floID)
-                        },
-
-                        distanceOf: function (floID, KB) {
-                            let decodedId = this.decodeID(floID);
-                            return KB.distance(KB.localNodeId, decodedId);
-                        },
-
-                        closestOf: function (floID, n, KB) {
-                            let decodedId = this.decodeID(floID);
-                            return KB.closest(decodedId, n)
-                        },
-
-                        constructKB: function (list, refID) {
-                            const KBoptions = {
-                                localNodeId: this.decodeID(refID)
-                            };
-                            let KB = new BuildKBucket(KBoptions);
-                            for (let id of list)
-                                this.addNode(id, KB)
-                            return KB;
-                        }
+                util: {
+                    decodeID(floID) {
+                        let k = bitjs.Base58.decode(floID)
+                        k.shift()
+                        k.splice(-4, 4)
+                        const decodedId = Crypto.util.bytesToHex(k);
+                        const nodeIdBigInt = new BigInteger(decodedId, 16);
+                        const nodeIdBytes = nodeIdBigInt.toByteArrayUnsigned();
+                        const nodeIdNewInt8Array = new Uint8Array(nodeIdBytes);
+                        return nodeIdNewInt8Array;
                     },
 
-                    launch: function () {
-                        return new Promise((resolve, reject) => {
-                            try {
-                                let superNodeList = Object.keys(floGlobals.supernodes);
-                                let masterID = floGlobals.SNStorageID;
-                                this.SNKB = this.util.constructKB(superNodeList, masterID);
-                                this.SNCO = superNodeList.map(sn => [this.util.distanceOf(sn, this.SNKB),
+                    addNode: function(floID, KB) {
+                        let decodedId = this.decodeID(floID);
+                        const contact = {
+                            id: decodedId,
+                            floID: floID
+                        };
+                        KB.add(contact)
+                    },
+
+                    removeNode: function(floID, KB) {
+                        let decodedId = this.decodeID(floID);
+                        KB.remove(decodedId)
+                    },
+
+                    isPresent: function(floID, KB) {
+                        let kArray = KB.toArray().map(k => k.floID);
+                        return kArray.includes(floID)
+                    },
+
+                    distanceOf: function(floID, KB) {
+                        let decodedId = this.decodeID(floID);
+                        return KB.distance(KB.localNodeId, decodedId);
+                    },
+
+                    closestOf: function(floID, n, KB) {
+                        let decodedId = this.decodeID(floID);
+                        return KB.closest(decodedId, n)
+                    },
+
+                    constructKB: function(list, refID) {
+                        const KBoptions = {
+                            localNodeId: this.decodeID(refID)
+                        };
+                        let KB = new BuildKBucket(KBoptions);
+                        for (let id of list)
+                            this.addNode(id, KB)
+                        return KB;
+                    }
+                },
+
+                launch: function() {
+                    return new Promise((resolve, reject) => {
+                        try {
+                            let superNodeList = Object.keys(floGlobals.supernodes);
+                            let masterID = floGlobals.SNStorageID;
+                            this.SNKB = this.util.constructKB(superNodeList, masterID);
+                            this.SNCO = superNodeList.map(sn => [this.util.distanceOf(sn, this.SNKB),
                                     sn
                                 ])
-                                    .sort((a, b) => a[0] - b[0])
-                                    .map(a => a[1])
-                                resolve('Supernode KBucket formed');
-                            } catch (error) {
-                                reject(error);
-                            }
-                        });
-                    },
-
-                    innerNodes: function (id1, id2) {
-                        if (!this.SNCO.includes(id1) || !this.SNCO.includes(id2))
-                            throw Error('Given nodes are not supernode');
-                        let iNodes = []
-                        for (let i = this.SNCO.indexOf(id1) + 1; this.SNCO[i] != id2; i++) {
-                            if (i < this.SNCO.length)
-                                iNodes.push(this.SNCO[i])
-                            else i = -1
+                                .sort((a, b) => a[0] - b[0])
+                                .map(a => a[1])
+                            resolve('Supernode KBucket formed');
+                        } catch (error) {
+                            reject(error);
                         }
-                        return iNodes
-                    },
+                    });
+                },
 
-                    outterNodes: function (id1, id2) {
-                        if (!this.SNCO.includes(id1) || !this.SNCO.includes(id2))
-                            throw Error('Given nodes are not supernode');
-                        let oNodes = []
-                        for (let i = this.SNCO.indexOf(id2) + 1; this.SNCO[i] != id1; i++) {
-                            if (i < this.SNCO.length)
-                                oNodes.push(this.SNCO[i])
-                            else i = -1
-                        }
-                        return oNodes
-                    },
-
-                    prevNode: function (id, N = 1) {
-                        let n = N || this.SNCO.length;
-                        if (!this.SNCO.includes(id))
-                            throw Error('Given node is not supernode');
-                        let pNodes = []
-                        for (let i = 0, j = this.SNCO.indexOf(id) - 1; i < n; j--) {
-                            if (j == this.SNCO.indexOf(id))
-                                break;
-                            else if (j > -1)
-                                pNodes[i++] = this.SNCO[j]
-                            else j = this.SNCO.length
-                        }
-                        return (N == 1 ? pNodes[0] : pNodes)
-                    },
-
-                    nextNode: function (id, N = 1) {
-                        let n = N || this.SNCO.length;
-                        if (!this.SNCO.includes(id))
-                            throw Error('Given node is not supernode');
-                        if (!n) n = this.SNCO.length;
-                        let nNodes = []
-                        for (let i = 0, j = this.SNCO.indexOf(id) + 1; i < n; j++) {
-                            if (j == this.SNCO.indexOf(id))
-                                break;
-                            else if (j < this.SNCO.length)
-                                nNodes[i++] = this.SNCO[j]
-                            else j = -1
-                        }
-                        return (N == 1 ? nNodes[0] : nNodes)
-                    },
-
-                    closestNode: function (id, N = 1) {
-                        let decodedId = this.util.decodeID(id);
-                        let n = N || this.SNCO.length;
-                        let cNodes = this.SNKB.closest(decodedId, n)
-                            .map(k => k.floID)
-                        return (N == 1 ? cNodes[0] : cNodes)
+                innerNodes: function(id1, id2) {
+                    if (!this.SNCO.includes(id1) || !this.SNCO.includes(id2))
+                        throw Error('Given nodes are not supernode');
+                    let iNodes = []
+                    for (let i = this.SNCO.indexOf(id1) + 1; this.SNCO[i] != id2; i++) {
+                        if (i < this.SNCO.length)
+                            iNodes.push(this.SNCO[i])
+                        else i = -1
                     }
+                    return iNodes
                 },
 
-                inactive: new Set(),
-                connect(snID) {
-                    return new Promise((resolve, reject) => {
-                        if (!(snID in floGlobals.supernodes))
-                            return reject(`${snID} is not a supernode`)
-                        let inactive = this.inactive
-                        if (inactive.has(snID))
-                            return reject(`${snID} is not active`)
-                        var wsConn = new WebSocket("wss://" + floGlobals.supernodes[snID].uri + "/ws");
-                        wsConn.onmessage = (evt) => {
-                            if (evt.data == '$+')
-                                resolve(wsConn)
-                            else if (evt.data == '$-') {
-                                wsConn.close();
-                                inactive.add(snID)
-                                reject(`${snID} is not active`)
-                            }
-                        }
-                        wsConn.onerror = evt => {
-                            inactive.add(snID)
-                            reject(`${snID} is unavailable`)
-                        }
-                    })
+                outterNodes: function(id1, id2) {
+                    if (!this.SNCO.includes(id1) || !this.SNCO.includes(id2))
+                        throw Error('Given nodes are not supernode');
+                    let oNodes = []
+                    for (let i = this.SNCO.indexOf(id2) + 1; this.SNCO[i] != id1; i++) {
+                        if (i < this.SNCO.length)
+                            oNodes.push(this.SNCO[i])
+                        else i = -1
+                    }
+                    return oNodes
                 },
 
-                connectActive(snID, reverse = false) {
-                    return new Promise((resolve, reject) => {
-                        if (this.inactive.size === this.kBucket.SNCO.length)
-                            return reject('Cloud offline')
-                        if (!(snID in floGlobals.supernodes))
-                            snID = this.kBucket.closestNode(snID);
-                        this.connect(snID)
-                            .then(node => resolve(node))
+                prevNode: function(id, N = 1) {
+                    let n = N || this.SNCO.length;
+                    if (!this.SNCO.includes(id))
+                        throw Error('Given node is not supernode');
+                    let pNodes = []
+                    for (let i = 0, j = this.SNCO.indexOf(id) - 1; i < n; j--) {
+                        if (j == this.SNCO.indexOf(id))
+                            break;
+                        else if (j > -1)
+                            pNodes[i++] = this.SNCO[j]
+                        else j = this.SNCO.length
+                    }
+                    return (N == 1 ? pNodes[0] : pNodes)
+                },
+
+                nextNode: function(id, N = 1) {
+                    let n = N || this.SNCO.length;
+                    if (!this.SNCO.includes(id))
+                        throw Error('Given node is not supernode');
+                    if (!n) n = this.SNCO.length;
+                    let nNodes = []
+                    for (let i = 0, j = this.SNCO.indexOf(id) + 1; i < n; j++) {
+                        if (j == this.SNCO.indexOf(id))
+                            break;
+                        else if (j < this.SNCO.length)
+                            nNodes[i++] = this.SNCO[j]
+                        else j = -1
+                    }
+                    return (N == 1 ? nNodes[0] : nNodes)
+                },
+
+                closestNode: function(id, N = 1) {
+                    let decodedId = this.util.decodeID(id);
+                    let n = N || this.SNCO.length;
+                    let cNodes = this.SNKB.closest(decodedId, n)
+                        .map(k => k.floID)
+                    return (N == 1 ? cNodes[0] : cNodes)
+                }
+            },
+
+            inactive: new Set(),
+
+            ws_connect(snID) {
+                return new Promise((resolve, reject) => {
+                    if (!(snID in floGlobals.supernodes))
+                        return reject(`${snID} is not a supernode`)
+                    let inactive = this.inactive
+                    if (inactive.has(snID))
+                        return reject(`${snID} is not active`)
+                    var wsConn = new WebSocket("wss://" + floGlobals.supernodes[snID].uri + "/");
+                    wsConn.onopen = evt => resolve(wsConn);
+                    wsConn.onerror = evt => {
+                        inactive.add(snID)
+                        reject(`${snID} is unavailable`)
+                    }
+                })
+            },
+
+            ws_activeConnect(snID, reverse = false) {
+                return new Promise((resolve, reject) => {
+                    if (this.inactive.size === this.kBucket.SNCO.length)
+                        return reject('Cloud offline');
+                    if (!(snID in floGlobals.supernodes))
+                        snID = this.kBucket.closestNode(snID);
+                    this.ws_connect(snID)
+                        .then(node => resolve(node))
+                        .catch(error => {
+                            if (reverse)
+                                var nxtNode = this.kBucket.prevNode(snID);
+                            else
+                                var nxtNode = this.kBucket.nextNode(snID);
+                            this.ws_activeConnect(nxtNode, reverse)
+                                .then(node => resolve(node))
+                                .catch(error => reject(error))
+                        })
+                })
+            },
+
+            fetch_API: function(snID, data) {
+                return new Promise((resolve, reject) => {
+                    if (this.inactive.has(snID))
+                        return reject(`${snID} is not active`);
+                    let fetcher, sn_url = "https://" + floGlobals.supernodes[snID].uri;
+                    if (typeof data === "string")
+                        fetcher = fetch(sn_url + "?" + data);
+                    else if (typeof data === "object" && data.method === "POST")
+                        fetcher = fetch(sn_url, data);
+                    fetcher.then(response => {
+                        if (response.ok)
+                            resolve(response);
+                        else
+                            reject(response);
+                    }).catch(error => reject(error))
+                })
+            },
+
+            fetch_ActiveAPI: function(snID, data, reverse = false) {
+                return new Promise((resolve, reject) => {
+                    if (this.inactive.size === this.kBucket.SNCO.length)
+                        return reject('Cloud offline');
+                    if (!(snID in floGlobals.supernodes))
+                        snID = this.kBucket.closestNode(snID);
+                    this.fetch_API(snID, data)
+                        .then(result => resolve(result))
+                        .catch(error => {
+                            this.inactive.add(snID)
+                            if (reverse)
+                                var nxtNode = this.kBucket.prevNode(snID);
+                            else
+                                var nxtNode = this.kBucket.nextNode(snID);
+                            this.fetch_ActiveAPI(nxtNode, data, reverse)
+                                .then(result => resolve(result))
+                                .catch(error => reject(error));
+                        })
+                })
+            },
+
+            singleRequest: function(floID, data_obj, method = "POST") {
+                return new Promise((resolve, reject) => {
+                    let data;
+                    if (method === "POST")
+                        data = {
+                            method: "POST",
+                            body: JSON.stringify(data_obj)
+                        };
+                    else
+                        data = new URLSearchParams(JSON.parse(JSON.stringify(data_obj))).toString();
+                    this.fetch_ActiveAPI(floID, data).then(response => {
+                        response.json()
+                            .then(result => resolve(this.objectifier(result)))
                             .catch(error => {
-                                if (reverse)
-                                    var nxtNode = this.kBucket.prevNode(snID);
-                                else
-                                    var nxtNode = this.kBucket.nextNode(snID);
-                                this.connectActive(nxtNode, reverse)
-                                    .then(node => resolve(node))
+                                response.text()
+                                    .then(result => reject(result)) //Error Message from Node
                                     .catch(error => reject(error))
                             })
-                    })
-                },
-
-                singleRequest: function (floID, data) {
-                    return new Promise((resolve, reject) => {
-                        this.connectActive(floID).then(node => {
-                            let randID = floCrypto.randString(5);
-                            node.send(`${floID}|${randID}:${JSON.stringify(data)}`);
-                            node.onmessage = (evt) => {
-                                if (evt.data.startsWith(randID, 1)) {
-                                    try {
-                                        let data = JSON.parse(evt.data.substring(42))
-                                        resolve(data)
-                                    } catch (error) {
-                                        reject(evt.data.substring(42))
-                                    } finally {
-                                        node.close()
-                                    }
-                                }
-                            }
-                        }).catch(error => reject(error));
-                    });
-                },
-
-                liveRequest: function (floID, datareq, callback) {
-                    let request = {
-                        ...datareq.request
-                    };
-                    const checkFilter = (v, d, r) =>
-                        (!r.atVectorClock || r.atVectorClock == v) &&
-                        (r.atVectorClock || !r.lowerVectorClock || r.lowerVectorClock <= v) &&
-                        (r.atVectorClock || !r.upperVectorClock || r.upperVectorClock >= v) &&
-                        r.application == d.application &&
-                        r.receiverID == d.receiverID &&
-                        (!r.comment || r.comment == d.comment) &&
-                        (!r.type || r.type == d.type) &&
-                        (!r.senderIDs || r.senderIDs.includes(d.senderID));
-                    return new Promise((resolve, reject) => {
-                        this.connectActive(floID).then(node => {
-                            let randID = floCrypto.randString(5);
-                            node.send(`${floID}|${randID}:${JSON.stringify(datareq)}`);
-                            node.onmessage = (evt) => {
-                                if (evt.data.startsWith(randID, 1))
-                                    var i = 42
-                                else if (evt.data.startsWith(floID, 1))
-                                    var i = 36
-                                else return;
-                                let d = e = null;
-                                try {
-                                    let data = JSON.parse(evt.data.substring(i))
-                                    let filter = {}
-                                    for (let v in data)
-                                        if (checkFilter(v, data[v], request))
-                                            filter[v] = data[v]
-                                    d = filter
-                                } catch (error) {
-                                    e = evt.data.substring(i)
-                                } finally {
-                                    callback(d, e)
-                                }
-                            }
-                            this.liveRequest[randID] = node;
-                            this.liveRequest[randID].request = request;
-                            resolve(randID)
-                        }).catch(error => reject(error));
-                    });
-                },
-
-                encodeMessage: function (message) {
-                    return btoa(unescape(encodeURIComponent(JSON.stringify(message))))
-                },
-
-                decodeMessage: function (message) {
-                    return JSON.parse(decodeURIComponent(escape(atob(message))))
-                },
-
-                filterKey: function (type, options) {
-                    return type + (options.comment ? ':' + options.comment : '') +
-                        '|' + (options.receiverID || floGlobals.adminID) +
-                        '|' + (options.application || floGlobals.application);
-                },
-
-                lastCommit: function (method, objName) {
-                    switch (method) {
-                        case "GET":
-                            return JSON.parse(this.lastCommit[objName]);
-                        case "SET":
-                            this.lastCommit[objName] = JSON.stringify(floGlobals.appObjects[objName]);
-                    }
-                },
-
-                updateObject: function (dataSet) {
-                    try {
-                        console.log(dataSet)
-                        let updatedObjects = new Set()
-                        for (vc in dataSet) {
-                            switch (dataSet[vc].comment) {
-                                case "RESET":
-                                    if (dataSet[vc].message.reset)
-                                        floGlobals.appObjects[dataSet[vc].type] = dataSet[vc].message.reset;
-                                    break;
-                                case "UPDATE":
-                                    if (dataSet[vc].message.update)
-                                        floGlobals.appObjects[dataSet[vc].type] = mergeDiff(floGlobals
-                                            .appObjects[dataSet[vc].type], message.diff)
-                            }
-                            floGlobals.lastVC[dataSet[vc].type] = vc;
-                            updatedObjects.add(dataSet[vc].type)
-                        }
-                        updatedObjects.forEach(o => {
-                            compactIDB.writeData("appObjects", floGlobals.appObjects[o], o)
-                            compactIDB.writeData("lastVC", floGlobals.lastVC[o], o)
-                        });
-                    } catch (error) {
-                        console.error(error)
-                    }
-                },
-
-                storeGeneral: function (fk, dataSet) {
-                    try {
-                        console.log(dataSet)
-                        if (typeof floGlobals.generalData[fk] !== "object")
-                            floGlobals.generalData[fk] = {}
-                        for (let vc in dataSet)
-                            floGlobals.generalData[fk][vc] = dataSet[vc];
-                        floGlobals.lastVC[fk] = Object.keys(floGlobals.generalData[fk]).sort().pop()
-                        compactIDB.writeData("lastVC", floGlobals.lastVC[fk], fk)
-                        compactIDB.writeData("generalData", floGlobals.generalData[fk], fk)
-                    } catch (error) {
-                        console.error(error)
-                    }
-                }
-            },
-
-            //send Any message to supernode cloud storage
-            sendApplicationData: function (message, type, options = {}) {
-                return new Promise((resolve, reject) => {
-                    var data = {
-                        senderID: myFloID,
-                        receiverID: options.receiverID || floGlobals.adminID,
-                        pubKey: myPubKey,
-                        message: this.util.encodeMessage(message),
-                        time: Date.now(),
-                        application: options.application || floGlobals.application,
-                        type: type,
-                        comment: options.comment || ""
-                    }
-                    let hashcontent = ["receiverID", "time", "application", "type", "message", "comment"]
-                        .map(d => data[d]).join("|")
-                    data.sign = floCrypto.signData(hashcontent, myPrivKey)
-                    this.util.singleRequest(data.receiverID, data)
-                        .then(result => {
-                            data.message = message
-                            resolve({
-                                [result.vectorClock]: data
-                            })
-                        }).catch(error => reject(error))
-                })
-            },
-
-            //request any data from supernode cloud
-            requestApplicationData: function (type, options = {}) {
-                return new Promise((resolve, reject) => {
-                    var request = {
-                        receiverID: options.receiverID || floGlobals.adminID,
-                        senderIDs: options.senderIDs || undefined,
-                        application: options.application || floGlobals.application,
-                        type: type,
-                        comment: options.comment || undefined,
-                        lowerVectorClock: options.lowerVectorClock || undefined,
-                        upperVectorClock: options.upperVectorClock || undefined,
-                        atVectorClock: options.atVectorClock || undefined,
-                        mostRecent: options.mostRecent || undefined,
-                    }
-                    var datareq = {
-                        time: Date.now(),
-                        request
-                    }
-                    if (options.callback instanceof Function) {
-                        let callback = (d, e) => {
-                            for (let v in d)
-                                d[v].message = this.util.decodeMessage(d[v].message)
-                            options.callback(d, e)
-                        }
-                        this.util.liveRequest(request.receiverID, datareq, callback)
-                            .then(result => resolve(result))
-                            .catch(error => reject(error))
-                    } else {
-                        this.util.singleRequest(request.receiverID, datareq).then(data => {
-                            for (let v in data)
-                                data[v].message = this.util.decodeMessage(data[v].message)
-                            resolve(data)
-                        }).catch(error => reject(error))
-                    }
-                })
-            },
-
-            //delete data from supernode cloud (received only)
-            deleteApplicationData: function (vectorClocks, options = {}) {
-                return new Promise((resolve, reject) => {
-                    var delreq = {
-                        requestorID: myFloID,
-                        pubKey: myPubKey,
-                        time: Date.now(),
-                        delete: (Array.isArray(vectorClocks) ? vectorClocks : [vectorClocks]),
-                        application: options.application || floGlobals.application
-                    }
-                    let hashcontent = ["time", "application", "delete"]
-                        .map(d => delreq[d]).join("|")
-                    delreq.sign = floCrypto.signData(hashcontent, myPrivKey)
-                    this.util.singleRequest(delreq.requestorID, delreq).then(result => {
-                        let success = [],
-                            failed = [];
-                        result.forEach(r => r.status === 'fulfilled' ?
-                            success.push(r.value) : failed.push(r.reason));
-                        resolve({
-                            success,
-                            failed
-                        })
                     }).catch(error => reject(error))
                 })
             },
 
-            //edit comment of data in supernode cloud (mutable comments only)
-            editApplicationData: function (vectorClock, newComment, oldData, options = {}) {
+            liveRequest: function(floID, request, callback) {
+                const checkFilter = (v, d, r) =>
+                    (!r.atVectorClock || r.atVectorClock == v) &&
+                    (r.atVectorClock || !r.lowerVectorClock || r.lowerVectorClock <= v) &&
+                    (r.atVectorClock || !r.upperVectorClock || r.upperVectorClock >= v) &&
+                    r.application == d.application &&
+                    r.receiverID == d.receiverID &&
+                    (!r.comment || r.comment == d.comment) &&
+                    (!r.type || r.type == d.type) &&
+                    (!r.senderIDs || r.senderIDs.includes(d.senderID));
                 return new Promise((resolve, reject) => {
-                    let p0
-                    if (!oldData) {
-                        options.atVectorClock = vectorClock;
-                        options.callback = false;
-                        p0 = this.requestApplicationData(false, options)
-                    } else
-                        p0 = Promise.resolve({
-                            vectorClock: {
-                                ...oldData
-                            }
-                        })
-                    p0.then(d => {
-                        if (d.senderID != myFloID)
-                            return reject("Invalid requestorID")
-                        else if (!d.comment.startsWith("EDIT:"))
-                            return reject("Data immutable")
-                        let data = {
-                            requestorID: myFloID,
-                            receiverID: d.receiverID,
-                            time: Date.now(),
-                            application: d.application,
-                            edit: {
-                                vectorClock: vectorClock,
-                                comment: newComment
+                    this.ws_activeConnect(floID).then(node => {
+                        let randID = floCrypto.randString(5);
+                        node.send(JSON.stringify(request));
+                        node.onmessage = (evt) => {
+                            let d = e = null;
+                            try {
+                                let data = this.objectifier(JSON.parse(evt.data)),
+                                    filter = {};
+                                for (let v in data)
+                                    if (checkFilter(v, data[v], request))
+                                        filter[v] = data[v];
+                                d = filter;
+                            } catch (error) {
+                                e = evt.data
+                            } finally {
+                                callback(d, e)
                             }
                         }
-                        d.comment = data.edit.comment;
-                        let hashcontent = ["receiverID", "time", "application", "type", "message",
+                        this.liveRequest[randID] = node;
+                        this.liveRequest[randID].request = request;
+                        resolve(randID)
+                    }).catch(error => reject(error));
+                });
+            },
+
+            encodeMessage: function(message) {
+                return btoa(unescape(encodeURIComponent(JSON.stringify(message))))
+            },
+
+            decodeMessage: function(message) {
+                return JSON.parse(decodeURIComponent(escape(atob(message))))
+            },
+
+            filterKey: function(type, options) {
+                return type + (options.comment ? ':' + options.comment : '') +
+                    '|' + (options.receiverID || floGlobals.adminID) +
+                    '|' + (options.application || floGlobals.application);
+            },
+
+            lastCommit: function(method, objName) {
+                switch (method) {
+                    case "GET":
+                        return JSON.parse(this.lastCommit[objName]);
+                    case "SET":
+                        this.lastCommit[objName] = JSON.stringify(floGlobals.appObjects[objName]);
+                }
+            },
+
+            updateObject: function(dataSet) {
+                try {
+                    console.log(dataSet)
+                    let updatedObjects = new Set()
+                    for (vc in dataSet) {
+                        switch (dataSet[vc].comment) {
+                            case "RESET":
+                                if (dataSet[vc].message.reset)
+                                    floGlobals.appObjects[dataSet[vc].type] = dataSet[vc].message.reset;
+                                break;
+                            case "UPDATE":
+                                if (dataSet[vc].message.diff)
+                                    floGlobals.appObjects[dataSet[vc].type] = mergeDiff(floGlobals.appObjects[dataSet[vc].type], dataSet[vc].message.diff)
+                        }
+                        floGlobals.lastVC[dataSet[vc].type] = vc;
+                        updatedObjects.add(dataSet[vc].type)
+                    }
+                    updatedObjects.forEach(o => {
+                        compactIDB.writeData("appObjects", floGlobals.appObjects[o], o)
+                        compactIDB.writeData("lastVC", floGlobals.lastVC[o], o)
+                    });
+                } catch (error) {
+                    console.error(error)
+                }
+            },
+
+            storeGeneral: function(fk, dataSet) {
+                try {
+                    console.log(dataSet)
+                    if (typeof floGlobals.generalData[fk] !== "object")
+                        floGlobals.generalData[fk] = {}
+                    for (let vc in dataSet)
+                        floGlobals.generalData[fk][vc] = dataSet[vc];
+                    floGlobals.lastVC[fk] = Object.keys(floGlobals.generalData[fk]).sort().pop()
+                    compactIDB.writeData("lastVC", floGlobals.lastVC[fk], fk)
+                    compactIDB.writeData("generalData", floGlobals.generalData[fk], fk)
+                } catch (error) {
+                    console.error(error)
+                }
+            },
+
+            objectifier: function(data) {
+                if (!Array.isArray(data))
+                    data = [data];
+                return Object.fromEntries(data.map(d => {
+                    d.message = this.decodeMessage(d.message);
+                    return [d.vectorClock, d];
+                }));
+            }
+        },
+
+        //send Any message to supernode cloud storage
+        sendApplicationData: function(message, type, options = {}) {
+            return new Promise((resolve, reject) => {
+                var data = {
+                    senderID: myFloID,
+                    receiverID: options.receiverID || floGlobals.adminID,
+                    pubKey: myPubKey,
+                    message: this.util.encodeMessage(message),
+                    time: Date.now(),
+                    application: options.application || floGlobals.application,
+                    type: type,
+                    comment: options.comment || ""
+                }
+                let hashcontent = ["receiverID", "time", "application", "type", "message", "comment"]
+                    .map(d => data[d]).join("|")
+                data.sign = floCrypto.signData(hashcontent, myPrivKey)
+                this.util.singleRequest(data.receiverID, data)
+                    .then(result => resolve(result))
+                    .catch(error => reject(error))
+            })
+        },
+
+        //request any data from supernode cloud
+        requestApplicationData: function(type, options = {}) {
+            return new Promise((resolve, reject) => {
+                var request = {
+                    receiverID: options.receiverID || floGlobals.adminID,
+                    senderIDs: options.senderIDs || undefined,
+                    application: options.application || floGlobals.application,
+                    type: type,
+                    comment: options.comment || undefined,
+                    lowerVectorClock: options.lowerVectorClock || undefined,
+                    upperVectorClock: options.upperVectorClock || undefined,
+                    atVectorClock: options.atVectorClock || undefined,
+                    mostRecent: options.mostRecent || undefined,
+                }
+
+                if (options.callback instanceof Function) {
+                    this.util.liveRequest(request.receiverID, request, options.callback)
+                        .then(result => resolve(result))
+                        .catch(error => reject(error))
+                } else {
+                    if (options.method === "POST")
+                        request = {
+                            time: Date.now(),
+                            request
+                        };
+                    this.util.singleRequest(request.receiverID, request, options.method || "GET")
+                        .then(data => resolve(data)).catch(error => reject(error))
+                }
+            })
+        },
+
+        //(NEEDS UPDATE) delete data from supernode cloud (received only)
+        deleteApplicationData: function(vectorClocks, options = {}) {
+            return new Promise((resolve, reject) => {
+                var delreq = {
+                    requestorID: myFloID,
+                    pubKey: myPubKey,
+                    time: Date.now(),
+                    delete: (Array.isArray(vectorClocks) ? vectorClocks : [vectorClocks]),
+                    application: options.application || floGlobals.application
+                }
+                let hashcontent = ["time", "application", "delete"]
+                    .map(d => delreq[d]).join("|")
+                delreq.sign = floCrypto.signData(hashcontent, myPrivKey)
+                this.util.singleRequest(delreq.requestorID, delreq).then(result => {
+                    let success = [],
+                        failed = [];
+                    result.forEach(r => r.status === 'fulfilled' ?
+                        success.push(r.value) : failed.push(r.reason));
+                    resolve({
+                        success,
+                        failed
+                    })
+                }).catch(error => reject(error))
+            })
+        },
+
+        //(NEEDS UPDATE) edit comment of data in supernode cloud (mutable comments only)
+        editApplicationData: function(vectorClock, newComment, oldData, options = {}) {
+            return new Promise((resolve, reject) => {
+                let p0
+                if (!oldData) {
+                    options.atVectorClock = vectorClock;
+                    options.callback = false;
+                    p0 = this.requestApplicationData(false, options)
+                } else
+                    p0 = Promise.resolve({
+                        vectorClock: {
+                            ...oldData
+                        }
+                    })
+                p0.then(d => {
+                    if (d.senderID != myFloID)
+                        return reject("Invalid requestorID")
+                    else if (!d.comment.startsWith("EDIT:"))
+                        return reject("Data immutable")
+                    let data = {
+                        requestorID: myFloID,
+                        receiverID: d.receiverID,
+                        time: Date.now(),
+                        application: d.application,
+                        edit: {
+                            vectorClock: vectorClock,
+                            comment: newComment
+                        }
+                    }
+                    d.comment = data.edit.comment;
+                    let hashcontent = ["receiverID", "time", "application", "type", "message",
                             "comment"
                         ]
-                            .map(x => d[x]).join("|")
-                        data.edit.sign = floCrypto.signData(hashcontent, myPrivKey)
-                        this.util.singleRequest(data.receiverID, data)
-                            .then(result => resolve("Data comment updated"))
-                            .catch(error => reject(error))
+                        .map(x => d[x]).join("|")
+                    data.edit.sign = floCrypto.signData(hashcontent, myPrivKey)
+                    this.util.singleRequest(data.receiverID, data)
+                        .then(result => resolve("Data comment updated"))
+                        .catch(error => reject(error))
+                })
+            })
+        },
+
+        //mark data in supernode cloud (subAdmin access only)
+        markApplicationData: function(mark, options = {}) {
+            return new Promise((resolve, reject) => {
+                if (!floGlobals.subAdmins.includes(myFloID))
+                    return reject("Only subAdmins can mark data")
+                if (typeof mark !== "object") {
+                    if (!Array.isArray(mark)) mark = [mark];
+                    let tmp = {}
+                    mark.forEach(vc => tmp[vc] = true)
+                    mark = tmp;
+                }
+                var markreq = {
+                    receiverID: options.receiverID || floGlobals.adminID,
+                    requestorID: myFloID,
+                    pubKey: myPubKey,
+                    time: Date.now(),
+                    mark: mark,
+                    application: options.application || floGlobals.application
+                }
+                let hashcontent = ["time", "application"]
+                    .map(d => markreq[d]).join("|") + JSON.stringify(markreq.mark)
+                markreq.sign = floCrypto.signData(hashcontent, myPrivKey)
+                this.util.singleRequest(markreq.requestorID, markreq).then(result => {
+                    let success = [],
+                        failed = [];
+                    result.forEach(r => r.status === 'fulfilled' ?
+                        success.push(r.value) : failed.push(r.reason));
+                    resolve({
+                        success,
+                        failed
                     })
-                })
-            },
+                }).catch(error => reject(error))
+            })
+        },
 
-            //mark data in supernode cloud (subAdmin access only)
-            markApplicationData: function (mark, options = {}) {
-                return new Promise((resolve, reject) => {
-                    if (!floGlobals.subAdmins.includes(myFloID))
-                        return reject("Only subAdmins can mark data")
-                    if (typeof mark !== "object") {
-                        if (!Array.isArray(mark)) mark = [mark];
-                        let tmp = {}
-                        mark.forEach(vc => tmp[vc] = true)
-                        mark = tmp;
+        //send General Data
+        sendGeneralData: function(message, type, options = {}) {
+            return new Promise((resolve, reject) => {
+                if (options.encrypt) {
+                    let encryptionKey = options.encrypt === true ?
+                        floGlobals.settings.encryptionKey : options.encrypt
+                    message = floCrypto.encryptData(JSON.stringify(message), encryptionKey)
+                }
+                this.sendApplicationData(message, type, options).then(result => {
+                    //options.comment = null;
+                    //var fk = this.util.filterKey(type, options)
+                    //this.util.storeGeneral(fk, result)
+                    resolve(result)
+                }).catch(error => reject(error))
+            })
+        },
+
+        //request General Data
+        requestGeneralData: function(type, options = {}) {
+            return new Promise((resolve, reject) => {
+                var fk = this.util.filterKey(type, options)
+                options.lowerVectorClock = options.lowerVectorClock || floGlobals.lastVC[fk] + 1;
+                if (options.callback instanceof Function) {
+                    let new_options = Object.create(options)
+                    new_options.callback = (d, e) => {
+                        this.util.storeGeneral(fk, d);
+                        options.callback(d, e)
                     }
-                    var markreq = {
-                        receiverID: options.receiverID || floGlobals.adminID,
-                        requestorID: myFloID,
-                        pubKey: myPubKey,
-                        time: Date.now(),
-                        mark: mark,
-                        application: options.application || floGlobals.application
-                    }
-                    let hashcontent = ["time", "application"]
-                        .map(d => markreq[d]).join("|") + JSON.stringify(markreq.mark)
-                    markreq.sign = floCrypto.signData(hashcontent, myPrivKey)
-                    this.util.singleRequest(markreq.requestorID, markreq).then(result => {
-                        let success = [],
-                            failed = [];
-                        result.forEach(r => r.status === 'fulfilled' ?
-                            success.push(r.value) : failed.push(r.reason));
-                        resolve({
-                            success,
-                            failed
-                        })
+                    this.requestApplicationData(type, new_options)
+                        .then(result => resolve(result))
+                        .catch(error => reject(error))
+                } else {
+                    this.requestApplicationData(type, options).then(dataSet => {
+                        this.util.storeGeneral(fk, dataSet)
+                        resolve(dataSet)
                     }).catch(error => reject(error))
-                })
-            },
+                }
+            })
+        },
 
-            //send General Data
-            sendGeneralData: function (message, type, options = {}) {
-                return new Promise((resolve, reject) => {
-                    if (options.encrypt) {
-                        let encryptionKey = options.encrypt === true ?
-                            floGlobals.settings.encryptionKey : options.encrypt
-                        message = floCrypto.encryptData(JSON.stringify(message), encryptionKey)
+        //request an object data from supernode cloud
+        requestObjectData: function(objectName, options = {}) {
+            return new Promise((resolve, reject) => {
+                options.lowerVectorClock = options.lowerVectorClock || floGlobals.lastVC[objectName] +
+                    1;
+                options.senderIDs = [false, null].includes(options.senderIDs) ? null :
+                    options.senderIDs || floGlobals.subAdmins;
+                options.mostRecent = true;
+                options.comment = 'RESET';
+                let callback = null;
+                if (options.callback instanceof Function) {
+                    callback = (d, e) => {
+                        this.util.updateObject(d);
+                        options.callback(d, e);
                     }
-                    this.sendApplicationData(message, type, options).then(result => {
-                        //options.comment = null;
-                        //var fk = this.util.filterKey(type, options)
-                        //this.util.storeGeneral(fk, result)
-                        resolve(result)
-                    }).catch(error => reject(error))
-                })
-            },
-
-            //request General Data
-            requestGeneralData: function (type, options = {}) {
-                return new Promise((resolve, reject) => {
-                    var fk = this.util.filterKey(type, options)
-                    options.lowerVectorClock = options.lowerVectorClock || floGlobals.lastVC[fk] + 1;
-                    if (options.callback instanceof Function) {
+                    delete options.callback;
+                }
+                this.requestApplicationData(objectName, options).then(dataSet => {
+                    this.util.updateObject(dataSet)
+                    delete options.comment;
+                    options.lowerVectorClock = floGlobals.lastVC[objectName] + 1
+                    delete options.mostRecent;
+                    if (callback) {
                         let new_options = Object.create(options)
-                        new_options.callback = (d, e) => {
-                            this.util.storeGeneral(fk, d);
-                            options.callback(d, e)
-                        }
-                        this.requestApplicationData(type, new_options)
+                        new_options.callback = callback;
+                        this.requestApplicationData(objectName, new_options)
                             .then(result => resolve(result))
                             .catch(error => reject(error))
                     } else {
-                        this.requestApplicationData(type, options).then(dataSet => {
-                            this.util.storeGeneral(fk, dataSet)
-                            resolve(dataSet)
+                        this.requestApplicationData(objectName, options).then(dataSet => {
+                            this.util.updateObject(dataSet)
+                            this.util.lastCommit("SET", objectName)
+                            resolve(floGlobals.appObjects[objectName])
                         }).catch(error => reject(error))
                     }
-                })
-            },
+                }).catch(error => reject(error))
+            })
+        },
 
-            //request an object data from supernode cloud
-            requestObjectData: function (objectName, options = {}) {
-                return new Promise((resolve, reject) => {
-                    options.lowerVectorClock = options.lowerVectorClock || floGlobals.lastVC[objectName] +
-                        1;
-                    options.senderIDs = [false, null].includes(options.senderIDs) ? null :
-                        options.senderIDs || floGlobals.subAdmins;
-                    options.mostRecent = true;
-                    options.comment = 'RESET';
-                    let callback = null;
-                    if (options.callback instanceof Function) {
-                        callback = (d, e) => {
-                            this.util.updateObject(d);
-                            options.callback(d, e);
-                        }
-                        delete options.callback;
-                    }
-                    this.requestApplicationData(objectName, options).then(dataSet => {
-                        this.util.updateObject(dataSet)
-                        delete options.comment;
-                        options.lowerVectorClock = floGlobals.lastVC[objectName] + 1
-                        delete options.mostRecent;
-                        if (callback) {
-                            let new_options = Object.create(options)
-                            new_options.callback = callback;
-                            this.requestApplicationData(objectName, new_options)
-                                .then(result => resolve(result))
-                                .catch(error => reject(error))
-                        } else {
-                            this.requestApplicationData(objectName, options).then(dataSet => {
-                                this.util.updateObject(dataSet)
-                                this.util.lastCommit("SET", objectName)
-                                resolve(floGlobals.appObjects[objectName])
-                            }).catch(error => reject(error))
-                        }
-                    }).catch(error => reject(error))
-                })
-            },
+        closeRequest: function(requestID) {
+            return new Promise((resolve, reject) => {
+                let conn = this.util.liveRequest[requestID]
+                if (!conn)
+                    return reject('Request not found')
+                conn.onclose = evt => {
+                    delete this.util.liveRequest[requestID];
+                    resolve('Request connection closed')
+                }
+                conn.close()
+            })
+        },
 
-            closeRequest: function (requestID) {
-                return new Promise((resolve, reject) => {
-                    let conn = this.util.liveRequest[requestID]
-                    if (!conn)
-                        return reject('Request not found')
-                    conn.onclose = evt => {
-                        delete this.util.liveRequest[requestID]
-                        resolve('Request connection closed')
-                    }
-                    conn.close()
-                })
-            },
+        //reset or initialize an object and send it to cloud
+        resetObjectData: function(objectName, options = {}) {
+            return new Promise((resolve, reject) => {
+                let message = {
+                    reset: floGlobals.appObjects[objectName]
+                }
+                options.comment = 'RESET';
+                this.sendApplicationData(message, objectName, options).then(result => {
+                    this.util.lastCommit("SET", objectName)
+                    resolve(result)
+                }).catch(error => reject(error))
+            })
+        },
 
-            //reset or initialize an object and send it to cloud
-            resetObjectData: function (objectName, options = {}) {
-                return new Promise((resolve, reject) => {
-                    let message = {
-                        reset: floGlobals.appObjects[objectName]
-                    }
-                    options.comment = 'RESET';
-                    this.sendApplicationData(message, objectName, options).then(result => {
-                        this.util.lastCommit("SET", objectName)
-                        resolve(result)
-                    }).catch(error => reject(error))
-                })
-            },
+        //update the diff and send it to cloud
+        updateObjectData: function(objectName, options = {}) {
+            return new Promise((resolve, reject) => {
+                let message = {
+                    diff: findDiff(this.util.lastCommit("GET", objectName), floGlobals.appObjects[
+                        objectName])
+                }
+                options.comment = 'UPDATE';
+                this.sendApplicationData(message, objectName, options).then(result => {
+                    this.util.lastCommit("SET", objectName)
+                    resolve(result)
+                }).catch(error => reject(error))
+            })
+        }
+    }
 
-            //update the diff and send it to cloud
-            updateObjectData: function (objectName, options = {}) {
-                return new Promise((resolve, reject) => {
-                    let message = {
-                        diff: findDiff(this.util.lastCommit("GET", objectName), floGlobals.appObjects[
-                            objectName])
-                    }
-                    options.comment = 'UPDATE';
-                    this.sendApplicationData(message, objectName, options).then(result => {
-                        this.util.lastCommit("SET", objectName)
-                        resolve(result)
-                    }).catch(error => reject(error))
-                })
+    /*Kademlia DHT K-bucket implementation as a binary tree.*/
+    function BuildKBucket(options = {}) {
+        this.localNodeId = options.localNodeId || window.crypto.getRandomValues(new Uint8Array(20))
+        this.numberOfNodesPerKBucket = options.numberOfNodesPerKBucket || 20
+        this.numberOfNodesToPing = options.numberOfNodesToPing || 3
+        this.distance = options.distance || this.distance
+        this.arbiter = options.arbiter || this.arbiter
+        this.metadata = Object.assign({}, options.metadata)
+
+        this.createNode = function() {
+            return {
+                contacts: [],
+                dontSplit: false,
+                left: null,
+                right: null
             }
         }
 
-        /*Kademlia DHT K-bucket implementation as a binary tree.*/
-        function BuildKBucket(options = {}) {
-            this.localNodeId = options.localNodeId || window.crypto.getRandomValues(new Uint8Array(20))
-            this.numberOfNodesPerKBucket = options.numberOfNodesPerKBucket || 20
-            this.numberOfNodesToPing = options.numberOfNodesToPing || 3
-            this.distance = options.distance || this.distance
-            this.arbiter = options.arbiter || this.arbiter
-            this.metadata = Object.assign({}, options.metadata)
+        this.ensureInt8 = function(name, val) {
+            if (!(val instanceof Uint8Array))
+                throw new TypeError(name + ' is not a Uint8Array')
+        }
 
-            this.createNode = function () {
-                return {
-                    contacts: [],
-                    dontSplit: false,
-                    left: null,
-                    right: null
-                }
-            }
-
-            this.ensureInt8 = function (name, val) {
-                if (!(val instanceof Uint8Array))
-                    throw new TypeError(name + ' is not a Uint8Array')
-            }
-
-            this.arrayEquals = function (array1, array2) {
-                if (array1 === array2)
-                    return true
-                if (array1.length !== array2.length)
-                    return false
-                for (let i = 0, length = array1.length; i < length; ++i)
-                    if (array1[i] !== array2[i])
-                        return false
+        this.arrayEquals = function(array1, array2) {
+            if (array1 === array2)
                 return true
-            }
+            if (array1.length !== array2.length)
+                return false
+            for (let i = 0, length = array1.length; i < length; ++i)
+                if (array1[i] !== array2[i])
+                    return false
+            return true
+        }
 
-            this.ensureInt8('option.localNodeId as parameter 1', this.localNodeId)
-            this.root = this.createNode()
+        this.ensureInt8('option.localNodeId as parameter 1', this.localNodeId)
+        this.root = this.createNode()
 
-            this.arbiter = function (incumbent, candidate) {
-                return incumbent.vectorClock > candidate.vectorClock ? incumbent : candidate
-            }
+        this.arbiter = function(incumbent, candidate) {
+            return incumbent.vectorClock > candidate.vectorClock ? incumbent : candidate
+        }
 
-            this.distance = function (firstId, secondId) {
-                let distance = 0
-                let i = 0
-                const min = Math.min(firstId.length, secondId.length)
-                const max = Math.max(firstId.length, secondId.length)
-                for (; i < min; ++i)
-                    distance = distance * 256 + (firstId[i] ^ secondId[i])
-                for (; i < max; ++i) distance = distance * 256 + 255
-                return distance
-            }
+        this.distance = function(firstId, secondId) {
+            let distance = 0
+            let i = 0
+            const min = Math.min(firstId.length, secondId.length)
+            const max = Math.max(firstId.length, secondId.length)
+            for (; i < min; ++i)
+                distance = distance * 256 + (firstId[i] ^ secondId[i])
+            for (; i < max; ++i) distance = distance * 256 + 255
+            return distance
+        }
 
-            this.add = function (contact) {
-                this.ensureInt8('contact.id', (contact || {}).id)
-                let bitIndex = 0
-                let node = this.root
-                while (node.contacts === null)
-                    node = this._determineNode(node, contact.id, bitIndex++)
-                const index = this._indexOf(node, contact.id)
-                if (index >= 0) {
-                    this._update(node, index, contact)
-                    return this
-                }
-                if (node.contacts.length < this.numberOfNodesPerKBucket) {
-                    node.contacts.push(contact)
-                    return this
-                }
-                if (node.dontSplit)
-                    return this
-                this._split(node, bitIndex)
-                return this.add(contact)
-            }
-
-            this.closest = function (id, n = Infinity) {
-                this.ensureInt8('id', id)
-                if ((!Number.isInteger(n) && n !== Infinity) || n <= 0)
-                    throw new TypeError('n is not positive number')
-                let contacts = []
-                for (let nodes = [this.root], bitIndex = 0; nodes.length > 0 && contacts.length < n;) {
-                    const node = nodes.pop()
-                    if (node.contacts === null) {
-                        const detNode = this._determineNode(node, id, bitIndex++)
-                        nodes.push(node.left === detNode ? node.right : node.left)
-                        nodes.push(detNode)
-                    } else
-                        contacts = contacts.concat(node.contacts)
-                }
-                return contacts
-                    .map(a => [this.distance(a.id, id), a])
-                    .sort((a, b) => a[0] - b[0])
-                    .slice(0, n)
-                    .map(a => a[1])
-            }
-
-            this.count = function () {
-                let count = 0
-                for (const nodes = [this.root]; nodes.length > 0;) {
-                    const node = nodes.pop()
-                    if (node.contacts === null)
-                        nodes.push(node.right, node.left)
-                    else
-                        count += node.contacts.length
-                }
-                return count
-            }
-
-            this._determineNode = function (node, id, bitIndex) {
-                const bytesDescribedByBitIndex = bitIndex >> 3
-                const bitIndexWithinByte = bitIndex % 8
-                if ((id.length <= bytesDescribedByBitIndex) && (bitIndexWithinByte !== 0))
-                    return node.left
-                const byteUnderConsideration = id[bytesDescribedByBitIndex]
-                if (byteUnderConsideration & (1 << (7 - bitIndexWithinByte)))
-                    return node.right
-                return node.left
-            }
-
-            this.get = function (id) {
-                this.ensureInt8('id', id)
-                let bitIndex = 0
-                let node = this.root
-                while (node.contacts === null)
-                    node = this._determineNode(node, id, bitIndex++)
-                const index = this._indexOf(node, id)
-                return index >= 0 ? node.contacts[index] : null
-            }
-
-            this._indexOf = function (node, id) {
-                for (let i = 0; i < node.contacts.length; ++i)
-                    if (this.arrayEquals(node.contacts[i].id, id))
-                        return i
-                return -1
-            }
-
-            this.remove = function (id) {
-                this.ensureInt8('the id as parameter 1', id)
-                let bitIndex = 0
-                let node = this.root
-                while (node.contacts === null)
-                    node = this._determineNode(node, id, bitIndex++)
-                const index = this._indexOf(node, id)
-                if (index >= 0)
-                    node.contacts.splice(index, 1)[0]
+        this.add = function(contact) {
+            this.ensureInt8('contact.id', (contact || {}).id)
+            let bitIndex = 0
+            let node = this.root
+            while (node.contacts === null)
+                node = this._determineNode(node, contact.id, bitIndex++)
+            const index = this._indexOf(node, contact.id)
+            if (index >= 0) {
+                this._update(node, index, contact)
                 return this
             }
-
-            this._split = function (node, bitIndex) {
-                node.left = this.createNode()
-                node.right = this.createNode()
-                for (const contact of node.contacts)
-                    this._determineNode(node, contact.id, bitIndex).contacts.push(contact)
-                node.contacts = null
-                const detNode = this._determineNode(node, this.localNodeId, bitIndex)
-                const otherNode = node.left === detNode ? node.right : node.left
-                otherNode.dontSplit = true
-            }
-
-            this.toArray = function () {
-                let result = []
-                for (const nodes = [this.root]; nodes.length > 0;) {
-                    const node = nodes.pop()
-                    if (node.contacts === null)
-                        nodes.push(node.right, node.left)
-                    else
-                        result = result.concat(node.contacts)
-                }
-                return result
-            }
-
-            this._update = function (node, index, contact) {
-                if (!this.arrayEquals(node.contacts[index].id, contact.id))
-                    throw new Error('wrong index for _update')
-                const incumbent = node.contacts[index]
-                const selection = this.arbiter(incumbent, contact)
-                if (selection === incumbent && incumbent !== contact) return
-                node.contacts.splice(index, 1)
-                node.contacts.push(selection)
+            if (node.contacts.length < this.numberOfNodesPerKBucket) {
+                node.contacts.push(contact)
+                return this
             }
+            if (node.dontSplit)
+                return this
+            this._split(node, bitIndex)
+            return this.add(contact)
         }
-    </script>
-    <script id="floDapps" version="2.0.1c">
-        /* General functions for FLO Dapps*/
-        const floDapps = {
 
-            util: {
+        this.closest = function(id, n = Infinity) {
+            this.ensureInt8('id', id)
+            if ((!Number.isInteger(n) && n !== Infinity) || n <= 0)
+                throw new TypeError('n is not positive number')
+            let contacts = []
+            for (let nodes = [this.root], bitIndex = 0; nodes.length > 0 && contacts.length < n;) {
+                const node = nodes.pop()
+                if (node.contacts === null) {
+                    const detNode = this._determineNode(node, id, bitIndex++)
+                    nodes.push(node.left === detNode ? node.right : node.left)
+                    nodes.push(detNode)
+                } else
+                    contacts = contacts.concat(node.contacts)
+            }
+            return contacts
+                .map(a => [this.distance(a.id, id), a])
+                .sort((a, b) => a[0] - b[0])
+                .slice(0, n)
+                .map(a => a[1])
+        }
 
-                initIndexedDB: function () {
-                    return new Promise((resolve, reject) => {
-                        var obs_g = {
-                            //general
-                            lastTx: {},
-                            //supernode (cloud list)
-                            supernodes: {
-                                indexes: {
-                                    uri: null,
-                                    pubKey: null
-                                }
+        this.count = function() {
+            let count = 0
+            for (const nodes = [this.root]; nodes.length > 0;) {
+                const node = nodes.pop()
+                if (node.contacts === null)
+                    nodes.push(node.right, node.left)
+                else
+                    count += node.contacts.length
+            }
+            return count
+        }
+
+        this._determineNode = function(node, id, bitIndex) {
+            const bytesDescribedByBitIndex = bitIndex >> 3
+            const bitIndexWithinByte = bitIndex % 8
+            if ((id.length <= bytesDescribedByBitIndex) && (bitIndexWithinByte !== 0))
+                return node.left
+            const byteUnderConsideration = id[bytesDescribedByBitIndex]
+            if (byteUnderConsideration & (1 << (7 - bitIndexWithinByte)))
+                return node.right
+            return node.left
+        }
+
+        this.get = function(id) {
+            this.ensureInt8('id', id)
+            let bitIndex = 0
+            let node = this.root
+            while (node.contacts === null)
+                node = this._determineNode(node, id, bitIndex++)
+            const index = this._indexOf(node, id)
+            return index >= 0 ? node.contacts[index] : null
+        }
+
+        this._indexOf = function(node, id) {
+            for (let i = 0; i < node.contacts.length; ++i)
+                if (this.arrayEquals(node.contacts[i].id, id))
+                    return i
+            return -1
+        }
+
+        this.remove = function(id) {
+            this.ensureInt8('the id as parameter 1', id)
+            let bitIndex = 0
+            let node = this.root
+            while (node.contacts === null)
+                node = this._determineNode(node, id, bitIndex++)
+            const index = this._indexOf(node, id)
+            if (index >= 0)
+                node.contacts.splice(index, 1)[0]
+            return this
+        }
+
+        this._split = function(node, bitIndex) {
+            node.left = this.createNode()
+            node.right = this.createNode()
+            for (const contact of node.contacts)
+                this._determineNode(node, contact.id, bitIndex).contacts.push(contact)
+            node.contacts = null
+            const detNode = this._determineNode(node, this.localNodeId, bitIndex)
+            const otherNode = node.left === detNode ? node.right : node.left
+            otherNode.dontSplit = true
+        }
+
+        this.toArray = function() {
+            let result = []
+            for (const nodes = [this.root]; nodes.length > 0;) {
+                const node = nodes.pop()
+                if (node.contacts === null)
+                    nodes.push(node.right, node.left)
+                else
+                    result = result.concat(node.contacts)
+            }
+            return result
+        }
+
+        this._update = function(node, index, contact) {
+            if (!this.arrayEquals(node.contacts[index].id, contact.id))
+                throw new Error('wrong index for _update')
+            const incumbent = node.contacts[index]
+            const selection = this.arbiter(incumbent, contact)
+            if (selection === incumbent && incumbent !== contact) return
+            node.contacts.splice(index, 1)
+            node.contacts.push(selection)
+        }
+    }
+</script>
+<script id="floDapps" version="2.0.1c">
+    /* General functions for FLO Dapps*/
+    const floDapps = {
+
+        util: {
+
+            initIndexedDB: function() {
+                return new Promise((resolve, reject) => {
+                    var obs_g = {
+                        //general
+                        lastTx: {},
+                        //supernode (cloud list)
+                        supernodes: {
+                            indexes: {
+                                uri: null,
+                                pubKey: null
                             }
                         }
-                        var obs_a = {
-                            //login credentials
-                            credentials: {},
-                            //for Dapps
-                            subAdmins: {},
-                            settings: {},
-                            appObjects: {},
-                            generalData: {},
-                            lastVC: {}
-                        }
-                        //add other given objectStores
-                        this.initIndexedDB.appObs = this.initIndexedDB.appObs || {}
-                        for (o in this.initIndexedDB.appObs)
-                            if (!(o in obs_a))
-                                obs_a[o] = this.initIndexedDB.appObs[o]
-                        Promise.all([
-                            compactIDB.initDB(floGlobals.application, obs_a),
-                            compactIDB.initDB("floDapps", obs_g)
-                        ]).then(result => {
-                            compactIDB.setDefaultDB(floGlobals.application)
-                            resolve("IndexedDB App Storage Initated Successfully")
-                        }).catch(error => reject(error));
+                    }
+                    var obs_a = {
+                        //login credentials
+                        credentials: {},
+                        //for Dapps
+                        subAdmins: {},
+                        settings: {},
+                        appObjects: {},
+                        generalData: {},
+                        lastVC: {}
+                    }
+                    //add other given objectStores
+                    this.initIndexedDB.appObs = this.initIndexedDB.appObs || {}
+                    for (o in this.initIndexedDB.appObs)
+                        if (!(o in obs_a))
+                            obs_a[o] = this.initIndexedDB.appObs[o]
+                    Promise.all([
+                        compactIDB.initDB(floGlobals.application, obs_a),
+                        compactIDB.initDB("floDapps", obs_g)
+                    ]).then(result => {
+                        compactIDB.setDefaultDB(floGlobals.application)
+                        resolve("IndexedDB App Storage Initated Successfully")
+                    }).catch(error => reject(error));
+                })
+            },
+
+            initUserDB: function(floID) {
+                return new Promise((resolve, reject) => {
+                    var obs = {
+                        contacts: {},
+                        pubKeys: {},
+                        messages: {}
+                    }
+                    compactIDB.initDB(`floDapps#${floID}`, obs).then(result => {
+                        resolve("UserDB Initated Successfully")
+                    }).catch(error => reject('Init userDB failed'));
+                })
+            },
+
+            loadUserDB: function(floID) {
+                return new Promise((resolve, reject) => {
+                    var loadData = ["contacts", "pubKeys", "messages"]
+                    var promises = []
+                    for (var i = 0; i < loadData.length; i++)
+                        promises[i] = compactIDB.readAllData(loadData[i], `floDapps#${floID}`)
+                    Promise.all(promises).then(results => {
+                        for (var i = 0; i < loadData.length; i++)
+                            floGlobals[loadData[i]] = results[i]
+                        resolve("Loaded Data from userDB")
+                    }).catch(error => reject('Load userDB failed'))
+                })
+            },
+
+            startUpFunctions: {
+
+                readSupernodeListFromAPI: function() {
+                    return new Promise((resolve, reject) => {
+                        compactIDB.readData("lastTx", floGlobals.SNStorageID, "floDapps").then(lastTx => {
+                            floBlockchainAPI.readData(floGlobals.SNStorageID, {
+                                ignoreOld: lastTx,
+                                sentOnly: true,
+                                pattern: "SuperNodeStorage"
+                            }).then(result => {
+                                for (var i = result.data.length - 1; i >= 0; i--) {
+                                    var content = JSON.parse(result.data[i]).SuperNodeStorage;
+                                    for (sn in content.removeNodes)
+                                        compactIDB.removeData("supernodes", sn, "floDapps");
+                                    for (sn in content.newNodes)
+                                        compactIDB.writeData("supernodes", content.newNodes[sn], sn, "floDapps");
+                                }
+                                compactIDB.writeData("lastTx", result.totalTxs, floGlobals.SNStorageID, "floDapps");
+                                compactIDB.readAllData("supernodes", "floDapps").then(result => {
+                                    floGlobals.supernodes = result;
+                                    floCloudAPI.util.kBucket.launch()
+                                        .then(result => resolve("Loaded Supernode list\n" + result))
+                                        .catch(error => reject(error))
+                                })
+                            })
+                        }).catch(error => reject(error))
                     })
                 },
 
-                initUserDB: function (floID) {
+                readAppConfigFromAPI: function() {
                     return new Promise((resolve, reject) => {
-                        var obs = {
-                            contacts: {},
-                            pubKeys: {},
-                            messages: {}
-                        }
-                        compactIDB.initDB(`floDapps#${floID}`, obs).then(result => {
-                            resolve("UserDB Initated Successfully")
-                        }).catch(error => reject('Init userDB failed'));
+                        compactIDB.readData("lastTx", `${floGlobals.application}|${floGlobals.adminID}`, "floDapps").then(lastTx => {
+                            floBlockchainAPI.readData(floGlobals.adminID, {
+                                ignoreOld: lastTx,
+                                sentOnly: true,
+                                pattern: floGlobals.application
+                            }).then(result => {
+                                for (var i = result.data.length - 1; i >= 0; i--) {
+                                    var content = JSON.parse(result.data[i])[floGlobals.application];
+                                    if (!content || typeof content !== "object")
+                                        continue;
+                                    if (Array.isArray(content.removeSubAdmin))
+                                        for (var j = 0; j < content.removeSubAdmin.length; j++)
+                                            compactIDB.removeData("subAdmins", content.removeSubAdmin[j]);
+                                    if (Array.isArray(content.addSubAdmin))
+                                        for (var k = 0; k < content.addSubAdmin.length; k++)
+                                            compactIDB.writeData("subAdmins", true, content.addSubAdmin[k]);
+                                    if (content.settings)
+                                        for (let l in content.settings)
+                                            compactIDB.writeData("settings", content.settings[l], l)
+                                }
+                                compactIDB.writeData("lastTx", result.totalTxs, `${floGlobals.application}|${floGlobals.adminID}`, "floDapps");
+                                compactIDB.readAllData("subAdmins").then(result => {
+                                    floGlobals.subAdmins = Object.keys(result);
+                                    compactIDB.readAllData("settings").then(result => {
+                                        floGlobals.settings = result;
+                                        resolve("Read app configuration from blockchain");
+                                    })
+                                })
+                            })
+                        }).catch(error => reject(error))
                     })
                 },
 
-                loadUserDB: function (floID) {
+                loadDataFromAppIDB: function() {
                     return new Promise((resolve, reject) => {
-                        var loadData = ["contacts", "pubKeys", "messages"]
+                        var loadData = ["appObjects", "generalData", "lastVC"]
                         var promises = []
                         for (var i = 0; i < loadData.length; i++)
-                            promises[i] = compactIDB.readAllData(loadData[i], `floDapps#${floID}`)
+                            promises[i] = compactIDB.readAllData(loadData[i])
                         Promise.all(promises).then(results => {
                             for (var i = 0; i < loadData.length; i++)
                                 floGlobals[loadData[i]] = results[i]
-                            resolve("Loaded Data from userDB")
-                        }).catch(error => reject('Load userDB failed'))
-                    })
-                },
-
-                startUpFunctions: {
-
-                    readSupernodeListFromAPI: function () {
-                        return new Promise((resolve, reject) => {
-                            compactIDB.readData("lastTx", floGlobals.SNStorageID, "floDapps").then(lastTx => {
-                                floBlockchainAPI.readData(floGlobals.SNStorageID, {
-                                    ignoreOld: lastTx,
-                                    sentOnly: true,
-                                    pattern: "SuperNodeStorage"
-                                }).then(result => {
-                                    for (var i = result.data.length - 1; i >= 0; i--) {
-                                        var content = JSON.parse(result.data[i]).SuperNodeStorage;
-                                        for (sn in content.removeNodes)
-                                            compactIDB.removeData("supernodes", sn, "floDapps");
-                                        for (sn in content.newNodes)
-                                            compactIDB.writeData("supernodes", content.newNodes[sn], sn, "floDapps");
-                                    }
-                                    compactIDB.writeData("lastTx", result.totalTxs, floGlobals.SNStorageID, "floDapps");
-                                    compactIDB.readAllData("supernodes", "floDapps").then(result => {
-                                        floGlobals.supernodes = result;
-                                        floCloudAPI.util.kBucket.launch()
-                                            .then(result => resolve("Loaded Supernode list\n" + result))
-                                            .catch(error => reject(error))
-                                    })
-                                })
-                            }).catch(error => reject(error))
-                        })
-                    },
-
-                    readAppConfigFromAPI: function () {
-                        return new Promise((resolve, reject) => {
-                            compactIDB.readData("lastTx", `${floGlobals.application}|${floGlobals.adminID}`, "floDapps").then(lastTx => {
-                                floBlockchainAPI.readData(floGlobals.adminID, {
-                                    ignoreOld: lastTx,
-                                    sentOnly: true,
-                                    pattern: floGlobals.application
-                                }).then(result => {
-                                    for (var i = result.data.length - 1; i >= 0; i--) {
-                                        var content = JSON.parse(result.data[i])[floGlobals.application];
-                                        if (!content || typeof content !== "object")
-                                            continue;
-                                        if (Array.isArray(content.removeSubAdmin))
-                                            for (var j = 0; j < content.removeSubAdmin.length; j++)
-                                                compactIDB.removeData("subAdmins", content.removeSubAdmin[j]);
-                                        if (Array.isArray(content.addSubAdmin))
-                                            for (var k = 0; k < content.addSubAdmin.length; k++)
-                                                compactIDB.writeData("subAdmins", true, content.addSubAdmin[k]);
-                                        if (content.settings)
-                                            for (let l in content.settings)
-                                                compactIDB.writeData("settings", content.settings[l], l)
-                                    }
-                                    compactIDB.writeData("lastTx", result.totalTxs, `${floGlobals.application}|${floGlobals.adminID}`, "floDapps");
-                                    compactIDB.readAllData("subAdmins").then(result => {
-                                        floGlobals.subAdmins = Object.keys(result);
-                                        compactIDB.readAllData("settings").then(result => {
-                                            floGlobals.settings = result;
-                                            resolve("Read app configuration from blockchain");
-                                        })
-                                    })
-                                })
-                            }).catch(error => reject(error))
-                        })
-                    },
-
-                    loadDataFromAppIDB: function () {
-                        return new Promise((resolve, reject) => {
-                            var loadData = ["appObjects", "generalData", "lastVC"]
-                            var promises = []
-                            for (var i = 0; i < loadData.length; i++)
-                                promises[i] = compactIDB.readAllData(loadData[i])
-                            Promise.all(promises).then(results => {
-                                for (var i = 0; i < loadData.length; i++)
-                                    floGlobals[loadData[i]] = results[i]
-                                resolve("Loaded Data from app IDB")
-                            }).catch(error => reject(error))
-                        })
-                    }
-                },
-
-                getCredentials: function () {
-
-                    const defaultInput = function (type) {
-                        return new Promise((resolve, reject) => {
-                            let inputVal = prompt(`Enter ${type}: `)
-                            if (inputVal === null)
-                                reject(null)
-                            else
-                                resolve(inputVal)
-                        })
-                    }
-
-                    const inputFn = this.getCredentials.privKeyInput || defaultInput;
-
-                    const readSharesFromIDB = function (indexArr) {
-                        return new Promise((resolve, reject) => {
-                            var promises = []
-                            for (var i = 0; i < indexArr.length; i++)
-                                promises.push(compactIDB.readData('credentials', indexArr[i]))
-                            Promise.all(promises).then(shares => {
-                                var secret = floCrypto.retrieveShamirSecret(shares)
-                                if (secret)
-                                    resolve(secret)
-                                else
-                                    reject("Shares are insufficient or incorrect")
-                            }).catch(error => reject(error))
-                        })
-                    }
-
-                    const writeSharesToIDB = function (shares, i = 0, resultIndexes = []) {
-                        return new Promise(resolve => {
-                            if (i >= shares.length)
-                                return resolve(resultIndexes)
-                            var n = floCrypto.randInt(0, 100000)
-                            compactIDB.addData("credentials", shares[i], n).then(res => {
-                                resultIndexes.push(n)
-                                writeSharesToIDB(shares, i + 1, resultIndexes)
-                                    .then(result => resolve(result))
-                            }).catch(error => {
-                                writeSharesToIDB(shares, i, resultIndexes)
-                                    .then(result => resolve(result))
-                            })
-                        })
-                    }
-
-                    const getPrivateKeyCredentials = function () {
-                        return new Promise((resolve, reject) => {
-                            var indexArr = localStorage.getItem(`${floGlobals.application}#privKey`)
-                            if (indexArr) {
-                                readSharesFromIDB(JSON.parse(indexArr))
-                                    .then(result => resolve(result))
-                                    .catch(error => reject(error))
-                            } else {
-                                var privKey;
-                                inputFn("PRIVATE_KEY").then(result => {
-                                    if (!result)
-                                        return reject("Empty Private Key")
-                                    var floID = floCrypto.getFloID(result)
-                                    if (!floID || !floCrypto.validateAddr(floID))
-                                        return reject("Invalid Private Key")
-                                    privKey = result;
-                                }).catch(error => {
-                                    console.log(error, "Generating Random Keys")
-                                    privKey = floCrypto.generateNewID().privKey
-                                }).finally(_ => {
-                                    if (!privKey)
-                                        return;
-                                    var threshold = floCrypto.randInt(10, 20)
-                                    var shares = floCrypto.createShamirsSecretShares(privKey, threshold, threshold)
-                                    writeSharesToIDB(shares).then(resultIndexes => {
-                                        //store index keys in localStorage
-                                        localStorage.setItem(`${floGlobals.application}#privKey`, JSON.stringify(resultIndexes))
-                                        //also add a dummy privatekey to the IDB
-                                        var randomPrivKey = floCrypto.generateNewID().privKey
-                                        var randomThreshold = floCrypto.randInt(10, 20)
-                                        var randomShares = floCrypto.createShamirsSecretShares(randomPrivKey, randomThreshold, randomThreshold)
-                                        writeSharesToIDB(randomShares)
-                                        //resolve private Key
-                                        resolve(privKey)
-                                    })
-                                })
-                            }
-                        })
-                    }
-
-                    const checkIfPinRequired = function (key) {
-                        return new Promise((resolve, reject) => {
-                            if (key.length == 52)
-                                resolve(key)
-                            else {
-                                inputFn("PIN/Password").then(pwd => {
-                                    try {
-                                        let privKey = Crypto.AES.decrypt(key, pwd);
-                                        resolve(privKey)
-                                    } catch (error) {
-                                        reject("Access Denied: Incorrect PIN/Password")
-                                    }
-                                }).catch(error => reject("Access Denied: PIN/Password required"))
-                            }
-                        })
-                    }
-
-                    return new Promise((resolve, reject) => {
-                        getPrivateKeyCredentials().then(key => {
-                            checkIfPinRequired(key).then(privKey => {
-                                try {
-                                    myPrivKey = privKey
-                                    myPubKey = floCrypto.getPubKeyHex(myPrivKey)
-                                    myFloID = floCrypto.getFloID(myPubKey)
-                                    resolve('Login Credentials loaded successful')
-                                } catch (error) {
-                                    console.log(error)
-                                    reject("Corrupted Private Key")
-                                }
-                            }).catch(error => reject(error))
+                            resolve("Loaded Data from app IDB")
                         }).catch(error => reject(error))
                     })
-                },
-
-                startUpLog: function (status, log) {
-                    if (status)
-                        console.log(log)
-                    else
-                        console.error(log)
-                },
-
-                callStartUpFunction: function (fname) {
-                    return new Promise((resolve, reject) => {
-                        this.startUpFunctions[fname]().then(result => {
-                            this.callStartUpFunction.completed += 1
-                            this.startUpLog(true, `${result}\nCompleted ${this.callStartUpFunction.completed}/${this.callStartUpFunction.total} Startup functions`)
-                            resolve(true)
-                        }).catch(error => {
-                            this.callStartUpFunction.failed += 1
-                            this.startUpLog(false, `${error}\nFailed ${this.callStartUpFunction.failed}/${this.callStartUpFunction.total} Startup functions`)
-                            reject(false)
-                        })
-                    })
                 }
             },
 
-            launchStartUp: function () {
-                return new Promise((resolve, reject) => {
-                    this.util.initIndexedDB().then(log => {
-                        console.log(log)
-                        this.util.callStartUpFunction.total = Object.keys(this.util.startUpFunctions).length
-                        this.util.callStartUpFunction.completed = 0
-                        this.util.callStartUpFunction.failed = 0
-                        var p0 = []
-                        for (fn in this.util.startUpFunctions)
-                            p0.push(this.util.callStartUpFunction(fn))
-                        const CnL = p => new Promise((res, rej) => {
-                            p.then(r => {
-                                this.util.startUpLog(true, r)
-                                res(r)
-                            }).catch(e => {
-                                this.util.startUpLog(false, e)
-                                rej(e)
-                            })
-                        })
-                        const callMidStartup = () => new Promise((res, rej) => {
-                            if (this.launchStartUp.midFunction instanceof Function) {
-                                this.launchStartUp.midFunction()
-                                    .then(r => res("Mid startup function completed"))
-                                    .catch(e => rej("Mid startup function failed"))
-                            } else
-                                res("No mid startup function")
-                        })
-                        let p1 = new Promise((res, rej) => {
-                            Promise.all(p0).then(r => {
-                                CnL(callMidStartup())
-                                    .then(r => res(true))
-                                    .catch(e => rej(false))
-                            })
-                        });
-                        let p2 = new Promise((res, rej) => {
-                            CnL(this.util.getCredentials()).then(r => {
-                                CnL(this.util.initUserDB(myFloID)).then(r => {
-                                    CnL(this.util.loadUserDB(myFloID))
-                                        .then(r => res(true))
-                                        .catch(e => rej(false))
-                                }).catch(e => rej(false))
-                            }).catch(e => rej(false))
-                        })
-                        Promise.all([p1, p2])
-                            .then(r => resolve('App Startup finished successful'))
-                            .catch(e => reject('App Startup failed'))
-                    }).catch(error => reject("App database initiation failed"))
-                })
-            },
+            getCredentials: function() {
 
-            addStartUpFunction: function (fname, fn) {
-                if (fname in this.util.startUpFunctions)
-                    throw (`Function ${fname} already defined`)
-                this.util.startUpFunctions[fname] = fn;
-            },
+                const defaultInput = function(type) {
+                    return new Promise((resolve, reject) => {
+                        let inputVal = prompt(`Enter ${type}: `)
+                        if (inputVal === null)
+                            reject(null)
+                        else
+                            resolve(inputVal)
+                    })
+                }
 
-            setMidStartup: function (fn) {
-                if (fn instanceof Function)
-                    this.launchStartUp.midFunction = fn;
-            },
+                const inputFn = this.getCredentials.privKeyInput || defaultInput;
 
-            setCustomStartupLogger: function (logger) {
-                this.util.startUpLog = logger;
-            },
-
-            setCustomPrivKeyInput: function (customFn) {
-                this.util.getCredentials.privKeyInput = customFn
-            },
-
-            setAppObjectStores: function (appObs) {
-                this.util.initIndexedDB.appObs = appObs
-            },
-
-            storeContact(floID, name) {
-                return new Promise((resolve, reject) => {
-                    if (!floCrypto.validateAddr(floID))
-                        return reject("Invalid floID!")
-                    compactIDB.writeData("contacts", name, floID, `floDapps#${myFloID}`).then(result => {
-                        floGlobals.contacts[floID] = name;
-                        resolve("Contact stored")
-                    }).catch(error => reject(error))
-                });
-            },
-
-            storePubKey(floID, pubKey) {
-                return new Promise((resolve, reject) => {
-                    if (floID in floGlobals.pubKeys)
-                        return resolve("pubKey already stored")
-                    if (!floCrypto.validateAddr(floID))
-                        return reject("Invalid floID!")
-                    if (floCrypto.getFloID(pubKey) != floID)
-                        return reject("Incorrect pubKey")
-                    compactIDB.writeData("pubKeys", pubKey, floID, `floDapps#${myFloID}`).then(result => {
-                        floGlobals.pubKeys[floID] = pubKey;
-                        resolve("pubKey stored")
-                    }).catch(error => reject(error))
-                });
-            },
-
-            sendMessage(floID, message) {
-                return new Promise((resolve, reject) => {
-                    let options = {
-                        receiverID: floID,
-                        application: "floDapps",
-                        comment: floGlobals.application
-                    }
-                    if (floID in floGlobals.pubKeys)
-                        message = floCrypto.encryptData(JSON.stringify(message), floGlobals.pubKeys[floID])
-                    floCloudAPI.sendApplicationData(message, "Message", options)
-                        .then(result => resolve(result))
-                        .catch(error => reject(error))
-                })
-            },
-
-            requestInbox(callback) {
-                return new Promise((resolve, reject) => {
-                    let lastVC = Object.keys(floGlobals.messages).sort().pop()
-                    let options = {
-                        receiverID: myFloID,
-                        application: "floDapps",
-                        lowerVectorClock: lastVC + 1
-                    }
-                    options.callback = (d, e) => {
-                        for (let v in d) {
-                            try {
-                                if (d[v].message instanceof Object && "secret" in d[v].message)
-                                    d[v].message = floCrypto.decryptData(d[v].message, myPrivKey)
-                            } catch (error) { }
-                            compactIDB.writeData("messages", d[v], v, `floDapps#${myFloID}`)
-                            floGlobals.messages[v] = d[v]
-                        }
-                        if (callback instanceof Function)
-                            callback(d, e)
-                    }
-                    floCloudAPI.requestApplicationData("Message", options)
-                        .then(result => resolve(result))
-                        .catch(error => reject(error))
-                })
-            },
-
-            manageAppConfig(adminPrivKey, addList, rmList, settings) {
-                return new Promise((resolve, reject) => {
-                    if (!Array.isArray(addList) || !addList.length) addList = undefined;
-                    if (!Array.isArray(rmList) || !rmList.length) rmList = undefined;
-                    if (!settings || typeof settings !== "object" || !Object.keys(settings).length) settings = undefined;
-                    if (!addList && !rmList && !settings)
-                        return reject("No configuration change")
-                    var floData = {
-                        [floGlobals.application]: {
-                            addSubAdmin: addList,
-                            removeSubAdmin: rmList,
-                            settings: settings
-                        }
-                    }
-                    var floID = floCrypto.getFloID(adminPrivKey)
-                    if (floID != floGlobals.adminID)
-                        reject('Access Denied for Admin privilege')
-                    else
-                        floBlockchainAPI.writeData(floID, JSON.stringify(floData), adminPrivKey)
-                            .then(result => resolve(['Updated App Configuration', result]))
-                            .catch(error => reject(error))
-                })
-            },
-
-            clearCredentials: function () {
-                return new Promise((resolve, reject) => {
-                    compactIDB.clearData('credentials', floGlobals.application).then(result => {
-                        localStorage.removeItem(`${floGlobals.application}#privKey`)
-                        myPrivKey = myPubKey = myFloID = undefined;
-                        resolve("privKey credentials deleted!")
-                    }).catch(error => reject(error))
-                })
-            },
-
-            deleteUserData: function (credentials = false) {
-                return new Promise((resolve, reject) => {
-                    let p = []
-                    p.push(compactIDB.deleteDB(`floDapps#${myFloID}`))
-                    if (credentials)
-                        p.push(this.clearCredentials())
-                    Promise.all(p)
-                        .then(result => resolve('User database(local) deleted'))
-                        .catch(error => reject(error))
-                })
-            },
-
-            deleteAppData: function () {
-                return new Promise((resolve, reject) => {
-                    compactIDB.deleteDB(floGlobals.application).then(result => {
-                        localStorage.removeItem(`${floGlobals.application}#privKey`)
-                        myPrivKey = myPubKey = myFloID = undefined;
-                        compactIDB.removeData('lastTx', `${floGlobals.application}|${floGlobals.adminID}`, 'floDapps')
-                            .then(result => resolve("App database(local) deleted"))
-                            .catch(error => reject(error))
-                    }).catch(error => reject(error))
-                })
-            },
-
-            securePrivKey: function (pwd) {
-                return new Promise((resolve, reject) => {
-                    let indexArr = localStorage.getItem(`${floGlobals.application}#privKey`)
-                    if (!indexArr)
-                        return reject("PrivKey not found");
-                    indexArr = JSON.parse(indexArr)
-                    let encryptedKey = Crypto.AES.encrypt(myPrivKey, pwd);
-                    let threshold = indexArr.length;
-                    let shares = floCrypto.createShamirsSecretShares(encryptedKey, threshold, threshold)
-                    let promises = [];
-                    let overwriteFn = (share, index) =>
-                        compactIDB.writeData("credentials", share, index, floGlobals.application);
-                    for (var i = 0; i < threshold; i++)
-                        promises.push(overwriteFn(shares[i], indexArr[i]));
-                    Promise.all(promises)
-                        .then(results => resolve("Private Key Secured"))
-                        .catch(error => reject(error))
-                })
-            },
-
-            verifyPin: function (pin = null) {
-                const readSharesFromIDB = function (indexArr) {
+                const readSharesFromIDB = function(indexArr) {
                     return new Promise((resolve, reject) => {
                         var promises = []
                         for (var i = 0; i < indexArr.length; i++)
                             promises.push(compactIDB.readData('credentials', indexArr[i]))
                         Promise.all(promises).then(shares => {
                             var secret = floCrypto.retrieveShamirSecret(shares)
-                            console.info(shares, secret)
                             if (secret)
                                 resolve(secret)
                             else
@@ -9477,119 +9177,465 @@
                         }).catch(error => reject(error))
                     })
                 }
-                return new Promise((resolve, reject) => {
-                    var indexArr = localStorage.getItem(`${floGlobals.application}#privKey`)
-                    console.info(indexArr)
-                    if (!indexArr)
-                        reject('No login credentials found')
-                    readSharesFromIDB(JSON.parse(indexArr)).then(key => {
-                        if (key.length == 52) {
-                            if (pin === null)
-                                resolve("Private key not secured")
-                            else
-                                reject("Private key not secured")
+
+                const writeSharesToIDB = function(shares, i = 0, resultIndexes = []) {
+                    return new Promise(resolve => {
+                        if (i >= shares.length)
+                            return resolve(resultIndexes)
+                        var n = floCrypto.randInt(0, 100000)
+                        compactIDB.addData("credentials", shares[i], n).then(res => {
+                            resultIndexes.push(n)
+                            writeSharesToIDB(shares, i + 1, resultIndexes)
+                                .then(result => resolve(result))
+                        }).catch(error => {
+                            writeSharesToIDB(shares, i, resultIndexes)
+                                .then(result => resolve(result))
+                        })
+                    })
+                }
+
+                const getPrivateKeyCredentials = function() {
+                    return new Promise((resolve, reject) => {
+                        var indexArr = localStorage.getItem(`${floGlobals.application}#privKey`)
+                        if (indexArr) {
+                            readSharesFromIDB(JSON.parse(indexArr))
+                                .then(result => resolve(result))
+                                .catch(error => reject(error))
                         } else {
-                            if (pin === null)
-                                return reject("PIN/Password required")
-                            try {
-                                let privKey = Crypto.AES.decrypt(key, pin);
-                                resolve("PIN/Password verified")
-                            } catch (error) {
-                                reject("Incorrect PIN/Password")
-                            }
+                            var privKey;
+                            inputFn("PRIVATE_KEY").then(result => {
+                                if (!result)
+                                    return reject("Empty Private Key")
+                                var floID = floCrypto.getFloID(result)
+                                if (!floID || !floCrypto.validateAddr(floID))
+                                    return reject("Invalid Private Key")
+                                privKey = result;
+                            }).catch(error => {
+                                console.log(error, "Generating Random Keys")
+                                privKey = floCrypto.generateNewID().privKey
+                            }).finally(_ => {
+                                if (!privKey)
+                                    return;
+                                var threshold = floCrypto.randInt(10, 20)
+                                var shares = floCrypto.createShamirsSecretShares(privKey, threshold, threshold)
+                                writeSharesToIDB(shares).then(resultIndexes => {
+                                    //store index keys in localStorage
+                                    localStorage.setItem(`${floGlobals.application}#privKey`, JSON.stringify(resultIndexes))
+                                    //also add a dummy privatekey to the IDB
+                                    var randomPrivKey = floCrypto.generateNewID().privKey
+                                    var randomThreshold = floCrypto.randInt(10, 20)
+                                    var randomShares = floCrypto.createShamirsSecretShares(randomPrivKey, randomThreshold, randomThreshold)
+                                    writeSharesToIDB(randomShares)
+                                    //resolve private Key
+                                    resolve(privKey)
+                                })
+                            })
                         }
+                    })
+                }
+
+                const checkIfPinRequired = function(key) {
+                    return new Promise((resolve, reject) => {
+                        if (key.length == 52)
+                            resolve(key)
+                        else {
+                            inputFn("PIN/Password").then(pwd => {
+                                try {
+                                    let privKey = Crypto.AES.decrypt(key, pwd);
+                                    resolve(privKey)
+                                } catch (error) {
+                                    reject("Access Denied: Incorrect PIN/Password")
+                                }
+                            }).catch(error => reject("Access Denied: PIN/Password required"))
+                        }
+                    })
+                }
+
+                return new Promise((resolve, reject) => {
+                    getPrivateKeyCredentials().then(key => {
+                        checkIfPinRequired(key).then(privKey => {
+                            try {
+                                myPrivKey = privKey
+                                myPubKey = floCrypto.getPubKeyHex(myPrivKey)
+                                myFloID = floCrypto.getFloID(myPubKey)
+                                resolve('Login Credentials loaded successful')
+                            } catch (error) {
+                                console.log(error)
+                                reject("Corrupted Private Key")
+                            }
+                        }).catch(error => reject(error))
                     }).catch(error => reject(error))
                 })
-
-
             },
 
-            getNextGeneralData: function (type, vectorClock = null, options = {}) {
-                var fk = floCloudAPI.util.filterKey(type, options)
-                vectorClock = vectorClock || this.getNextGeneralData[fk] || '0';
-                var filteredResult = {}
-                if (floGlobals.generalData[fk]) {
-                    for (let d in floGlobals.generalData[fk])
-                        if (d > vectorClock)
-                            filteredResult[d] = JSON.parse(JSON.stringify(floGlobals.generalData[fk][d]))
-                } else if (options.comment) {
-                    let comment = options.comment;
-                    delete options.comment;
-                    let fk = floCloudAPI.util.filterKey(type, options);
-                    for (let d in floGlobals.generalData[fk])
-                        if (d > vectorClock && floGlobals.generalData[fk][d].comment == comment)
-                            filteredResult[d] = JSON.parse(JSON.stringify(floGlobals.generalData[fk][d]))
+            startUpLog: function(status, log) {
+                if (status)
+                    console.log(log)
+                else
+                    console.error(log)
+            },
+
+            callStartUpFunction: function(fname) {
+                return new Promise((resolve, reject) => {
+                    this.startUpFunctions[fname]().then(result => {
+                        this.callStartUpFunction.completed += 1
+                        this.startUpLog(true, `${result}\nCompleted ${this.callStartUpFunction.completed}/${this.callStartUpFunction.total} Startup functions`)
+                        resolve(true)
+                    }).catch(error => {
+                        this.callStartUpFunction.failed += 1
+                        this.startUpLog(false, `${error}\nFailed ${this.callStartUpFunction.failed}/${this.callStartUpFunction.total} Startup functions`)
+                        reject(false)
+                    })
+                })
+            }
+        },
+
+        launchStartUp: function() {
+            return new Promise((resolve, reject) => {
+                this.util.initIndexedDB().then(log => {
+                    console.log(log)
+                    this.util.callStartUpFunction.total = Object.keys(this.util.startUpFunctions).length
+                    this.util.callStartUpFunction.completed = 0
+                    this.util.callStartUpFunction.failed = 0
+                    var p0 = []
+                    for (fn in this.util.startUpFunctions)
+                        p0.push(this.util.callStartUpFunction(fn))
+                    const CnL = p => new Promise((res, rej) => {
+                        p.then(r => {
+                            this.util.startUpLog(true, r)
+                            res(r)
+                        }).catch(e => {
+                            this.util.startUpLog(false, e)
+                            rej(e)
+                        })
+                    })
+                    const callMidStartup = () => new Promise((res, rej) => {
+                        if (this.launchStartUp.midFunction instanceof Function) {
+                            this.launchStartUp.midFunction()
+                                .then(r => res("Mid startup function completed"))
+                                .catch(e => rej("Mid startup function failed"))
+                        } else
+                            res("No mid startup function")
+                    })
+                    let p1 = new Promise((res, rej) => {
+                        Promise.all(p0).then(r => {
+                            CnL(callMidStartup())
+                                .then(r => res(true))
+                                .catch(e => rej(false))
+                        })
+                    });
+                    let p2 = new Promise((res, rej) => {
+                        CnL(this.util.getCredentials()).then(r => {
+                            CnL(this.util.initUserDB(myFloID)).then(r => {
+                                CnL(this.util.loadUserDB(myFloID))
+                                    .then(r => res(true))
+                                    .catch(e => rej(false))
+                            }).catch(e => rej(false))
+                        }).catch(e => rej(false))
+                    })
+                    Promise.all([p1, p2])
+                        .then(r => resolve('App Startup finished successful'))
+                        .catch(e => reject('App Startup failed'))
+                }).catch(error => reject("App database initiation failed"))
+            })
+        },
+
+        addStartUpFunction: function(fname, fn) {
+            if (fname in this.util.startUpFunctions)
+                throw (`Function ${fname} already defined`)
+            this.util.startUpFunctions[fname] = fn;
+        },
+
+        setMidStartup: function(fn) {
+            if (fn instanceof Function)
+                this.launchStartUp.midFunction = fn;
+        },
+
+        setCustomStartupLogger: function(logger) {
+            this.util.startUpLog = logger;
+        },
+
+        setCustomPrivKeyInput: function(customFn) {
+            this.util.getCredentials.privKeyInput = customFn
+        },
+
+        setAppObjectStores: function(appObs) {
+            this.util.initIndexedDB.appObs = appObs
+        },
+
+        storeContact(floID, name) {
+            return new Promise((resolve, reject) => {
+                if (!floCrypto.validateAddr(floID))
+                    return reject("Invalid floID!")
+                compactIDB.writeData("contacts", name, floID, `floDapps#${myFloID}`).then(result => {
+                    floGlobals.contacts[floID] = name;
+                    resolve("Contact stored")
+                }).catch(error => reject(error))
+            });
+        },
+
+        storePubKey(floID, pubKey) {
+            return new Promise((resolve, reject) => {
+                if (floID in floGlobals.pubKeys)
+                    return resolve("pubKey already stored")
+                if (!floCrypto.validateAddr(floID))
+                    return reject("Invalid floID!")
+                if (floCrypto.getFloID(pubKey) != floID)
+                    return reject("Incorrect pubKey")
+                compactIDB.writeData("pubKeys", pubKey, floID, `floDapps#${myFloID}`).then(result => {
+                    floGlobals.pubKeys[floID] = pubKey;
+                    resolve("pubKey stored")
+                }).catch(error => reject(error))
+            });
+        },
+
+        sendMessage(floID, message) {
+            return new Promise((resolve, reject) => {
+                let options = {
+                    receiverID: floID,
+                    application: "floDapps",
+                    comment: floGlobals.application
                 }
-                if (options.decrypt) {
-                    let decryptionKey = (options.decrypt === true) ? myPrivKey : options.decrypt;
-                    if (!Array.isArray(decryptionKey))
-                        decryptionKey = [decryptionKey];
-                    for (let f in filteredResult) {
-                        let data = filteredResult[f]
+                if (floID in floGlobals.pubKeys)
+                    message = floCrypto.encryptData(JSON.stringify(message), floGlobals.pubKeys[floID])
+                floCloudAPI.sendApplicationData(message, "Message", options)
+                    .then(result => resolve(result))
+                    .catch(error => reject(error))
+            })
+        },
+
+        requestInbox(callback) {
+            return new Promise((resolve, reject) => {
+                let lastVC = Object.keys(floGlobals.messages).sort().pop()
+                let options = {
+                    receiverID: myFloID,
+                    application: "floDapps",
+                    lowerVectorClock: lastVC + 1
+                }
+                options.callback = (d, e) => {
+                    for (let v in d) {
                         try {
-                            if (data.message instanceof Object && "secret" in data.message) {
-                                for (let key of decryptionKey) {
-                                    try {
-                                        let tmp = floCrypto.decryptData(data.message, key)
-                                        data.message = JSON.parse(tmp)
-                                        break;
-                                    } catch (error) { }
-                                }
-                            }
-                        } catch (error) { }
+                            if (d[v].message instanceof Object && "secret" in d[v].message)
+                                d[v].message = floCrypto.decryptData(d[v].message, myPrivKey)
+                        } catch (error) {}
+                        compactIDB.writeData("messages", d[v], v, `floDapps#${myFloID}`)
+                        floGlobals.messages[v] = d[v]
+                    }
+                    if (callback instanceof Function)
+                        callback(d, e)
+                }
+                floCloudAPI.requestApplicationData("Message", options)
+                    .then(result => resolve(result))
+                    .catch(error => reject(error))
+            })
+        },
+
+        manageAppConfig(adminPrivKey, addList, rmList, settings) {
+            return new Promise((resolve, reject) => {
+                if (!Array.isArray(addList) || !addList.length) addList = undefined;
+                if (!Array.isArray(rmList) || !rmList.length) rmList = undefined;
+                if (!settings || typeof settings !== "object" || !Object.keys(settings).length) settings = undefined;
+                if (!addList && !rmList && !settings)
+                    return reject("No configuration change")
+                var floData = {
+                    [floGlobals.application]: {
+                        addSubAdmin: addList,
+                        removeSubAdmin: rmList,
+                        settings: settings
                     }
                 }
-                this.getNextGeneralData[fk] = Object.keys(filteredResult).sort().pop();
-                return filteredResult;
-            },
+                var floID = floCrypto.getFloID(adminPrivKey)
+                if (floID != floGlobals.adminID)
+                    reject('Access Denied for Admin privilege')
+                else
+                    floBlockchainAPI.writeData(floID, JSON.stringify(floData), adminPrivKey)
+                    .then(result => resolve(['Updated App Configuration', result]))
+                    .catch(error => reject(error))
+            })
+        },
 
-            syncData: {
-                oldDevice: function () {
-                    return new Promise((resolve, reject) => {
-                        let sync = {
-                            contacts: floGlobals.contacts,
-                            pubKeys: floGlobals.pubKeys,
-                            messages: floGlobals.messages
-                        }
-                        let message = Crypto.AES.encrypt(JSON.stringify(sync), myPrivKey)
-                        let options = {
-                            receiverID: myFloID,
-                            application: "floDapps"
-                        }
-                        floCloudAPI.sendApplicationData(message, "syncData", options)
-                            .then(result => resolve(result))
-                            .catch(error => reject(error))
-                    })
-                },
+        clearCredentials: function() {
+            return new Promise((resolve, reject) => {
+                compactIDB.clearData('credentials', floGlobals.application).then(result => {
+                    localStorage.removeItem(`${floGlobals.application}#privKey`)
+                    myPrivKey = myPubKey = myFloID = undefined;
+                    resolve("privKey credentials deleted!")
+                }).catch(error => reject(error))
+            })
+        },
 
-                newDevice() {
-                    return new Promise((resolve, reject) => {
-                        var options = {
-                            receiverID: myFloID,
-                            senderIDs: myFloID,
-                            application: "floDapps",
-                            mostRecent: true,
+        deleteUserData: function(credentials = false) {
+            return new Promise((resolve, reject) => {
+                let p = []
+                p.push(compactIDB.deleteDB(`floDapps#${myFloID}`))
+                if (credentials)
+                    p.push(this.clearCredentials())
+                Promise.all(p)
+                    .then(result => resolve('User database(local) deleted'))
+                    .catch(error => reject(error))
+            })
+        },
+
+        deleteAppData: function() {
+            return new Promise((resolve, reject) => {
+                compactIDB.deleteDB(floGlobals.application).then(result => {
+                    localStorage.removeItem(`${floGlobals.application}#privKey`)
+                    myPrivKey = myPubKey = myFloID = undefined;
+                    compactIDB.removeData('lastTx', `${floGlobals.application}|${floGlobals.adminID}`, 'floDapps')
+                        .then(result => resolve("App database(local) deleted"))
+                        .catch(error => reject(error))
+                }).catch(error => reject(error))
+            })
+        },
+
+        securePrivKey: function(pwd) {
+            return new Promise((resolve, reject) => {
+                let indexArr = localStorage.getItem(`${floGlobals.application}#privKey`)
+                if (!indexArr)
+                    return reject("PrivKey not found");
+                indexArr = JSON.parse(indexArr)
+                let encryptedKey = Crypto.AES.encrypt(myPrivKey, pwd);
+                let threshold = indexArr.length;
+                let shares = floCrypto.createShamirsSecretShares(encryptedKey, threshold, threshold)
+                let promises = [];
+                let overwriteFn = (share, index) =>
+                    compactIDB.writeData("credentials", share, index, floGlobals.application);
+                for (var i = 0; i < threshold; i++)
+                    promises.push(overwriteFn(shares[i], indexArr[i]));
+                Promise.all(promises)
+                    .then(results => resolve("Private Key Secured"))
+                    .catch(error => reject(error))
+            })
+        },
+
+        verifyPin: function(pin = null) {
+            const readSharesFromIDB = function(indexArr) {
+                return new Promise((resolve, reject) => {
+                    var promises = []
+                    for (var i = 0; i < indexArr.length; i++)
+                        promises.push(compactIDB.readData('credentials', indexArr[i]))
+                    Promise.all(promises).then(shares => {
+                        var secret = floCrypto.retrieveShamirSecret(shares)
+                        console.info(shares, secret)
+                        if (secret)
+                            resolve(secret)
+                        else
+                            reject("Shares are insufficient or incorrect")
+                    }).catch(error => reject(error))
+                })
+            }
+            return new Promise((resolve, reject) => {
+                var indexArr = localStorage.getItem(`${floGlobals.application}#privKey`)
+                console.info(indexArr)
+                if (!indexArr)
+                    reject('No login credentials found')
+                readSharesFromIDB(JSON.parse(indexArr)).then(key => {
+                    if (key.length == 52) {
+                        if (pin === null)
+                            resolve("Private key not secured")
+                        else
+                            reject("Private key not secured")
+                    } else {
+                        if (pin === null)
+                            return reject("PIN/Password required")
+                        try {
+                            let privKey = Crypto.AES.decrypt(key, pin);
+                            resolve("PIN/Password verified")
+                        } catch (error) {
+                            reject("Incorrect PIN/Password")
                         }
-                        floCloudAPI.requestApplicationData("syncData", options).then(response => {
-                            let vc = Object.keys(response).sort().pop()
-                            let sync = JSON.parse(Crypto.AES.decrypt(response[vc].message, myPrivKey))
-                            let promises = []
-                            let store = (key, val, obs) => promises.push(compactIDB.writeData(obs, val, key, `floDapps#${floID}`));
-                            ["contacts", "pubKeys", "messages"].forEach(c => {
-                                for (let i in sync[c]) {
-                                    store(i, sync[c][i], c)
-                                    floGlobals[c][i] = sync[c][i]
-                                }
-                            })
-                            Promise.all(promises)
-                                .then(results => resolve("Sync data successful"))
-                                .catch(error => reject(error))
-                        }).catch(error => reject(error))
-                    })
+                    }
+                }).catch(error => reject(error))
+            })
+
+
+        },
+
+        getNextGeneralData: function(type, vectorClock = null, options = {}) {
+            var fk = floCloudAPI.util.filterKey(type, options)
+            vectorClock = vectorClock || this.getNextGeneralData[fk] || '0';
+            var filteredResult = {}
+            if (floGlobals.generalData[fk]) {
+                for (let d in floGlobals.generalData[fk])
+                    if (d > vectorClock)
+                        filteredResult[d] = JSON.parse(JSON.stringify(floGlobals.generalData[fk][d]))
+            } else if (options.comment) {
+                let comment = options.comment;
+                delete options.comment;
+                let fk = floCloudAPI.util.filterKey(type, options);
+                for (let d in floGlobals.generalData[fk])
+                    if (d > vectorClock && floGlobals.generalData[fk][d].comment == comment)
+                        filteredResult[d] = JSON.parse(JSON.stringify(floGlobals.generalData[fk][d]))
+            }
+            if (options.decrypt) {
+                let decryptionKey = (options.decrypt === true) ? myPrivKey : options.decrypt;
+                if (!Array.isArray(decryptionKey))
+                    decryptionKey = [decryptionKey];
+                for (let f in filteredResult) {
+                    let data = filteredResult[f]
+                    try {
+                        if (data.message instanceof Object && "secret" in data.message) {
+                            for (let key of decryptionKey) {
+                                try {
+                                    let tmp = floCrypto.decryptData(data.message, key)
+                                    data.message = JSON.parse(tmp)
+                                    break;
+                                } catch (error) {}
+                            }
+                        }
+                    } catch (error) {}
                 }
             }
-        }
-    </script>
-</body>
+            this.getNextGeneralData[fk] = Object.keys(filteredResult).sort().pop();
+            return filteredResult;
+        },
 
-</html>
\ No newline at end of file
+        syncData: {
+            oldDevice: function() {
+                return new Promise((resolve, reject) => {
+                    let sync = {
+                        contacts: floGlobals.contacts,
+                        pubKeys: floGlobals.pubKeys,
+                        messages: floGlobals.messages
+                    }
+                    let message = Crypto.AES.encrypt(JSON.stringify(sync), myPrivKey)
+                    let options = {
+                        receiverID: myFloID,
+                        application: "floDapps"
+                    }
+                    floCloudAPI.sendApplicationData(message, "syncData", options)
+                        .then(result => resolve(result))
+                        .catch(error => reject(error))
+                })
+            },
+
+            newDevice() {
+                return new Promise((resolve, reject) => {
+                    var options = {
+                        receiverID: myFloID,
+                        senderIDs: myFloID,
+                        application: "floDapps",
+                        mostRecent: true,
+                    }
+                    floCloudAPI.requestApplicationData("syncData", options).then(response => {
+                        let vc = Object.keys(response).sort().pop()
+                        let sync = JSON.parse(Crypto.AES.decrypt(response[vc].message, myPrivKey))
+                        let promises = []
+                        let store = (key, val, obs) => promises.push(compactIDB.writeData(obs, val, key, `floDapps#${floID}`));
+                        ["contacts", "pubKeys", "messages"].forEach(c => {
+                            for (let i in sync[c]) {
+                                store(i, sync[c][i], c)
+                                floGlobals[c][i] = sync[c][i]
+                            }
+                        })
+                        Promise.all(promises)
+                            .then(results => resolve("Sync data successful"))
+                            .catch(error => reject(error))
+                    }).catch(error => reject(error))
+                })
+            }
+        }
+    }
+</script>
+</body>
+</html>
