diff --git a/src/js/Worker.js b/src/js/Worker.js
index f09f0eb..1866d49 100644
--- a/src/js/Worker.js
+++ b/src/js/Worker.js
@@ -4,8 +4,10 @@ import { FileDownloader } from './modules/FileDownloader.js';
 
 const VoidFetch = function (event) {
     let vm = new ViewManager();
+    let url = new URL(event.request.url);
+    let path = url.pathname;
 
-    let hs = vm.ParseFrag(new URL(event.request.url).pathname.substr(1));
+    let hs = vm.ParseFrag(path.substr(1));
     if (hs !== null) {
         Log.I(`Worker taking request: ${hs.id}`);
 
@@ -15,8 +17,8 @@ const VoidFetch = function (event) {
             let fi = await Api.GetFileInfo(hs.id);
             if (fi.ok) {
                 let fd = new FileDownloader(fi.data, hs.key, hs.iv);
-                fd.onprogress = function(x) {
-                    if(client !== null && client !== undefined){
+                fd.onprogress = function (x) {
+                    if (client !== null && client !== undefined) {
                         client.postMessage({
                             type: 'progress',
                             x
diff --git a/src/js/modules/FileUpload.js b/src/js/modules/FileUpload.js
index 1f48597..6ca1ff0 100644
--- a/src/js/modules/FileUpload.js
+++ b/src/js/modules/FileUpload.js
@@ -255,7 +255,7 @@ function FileUpload(file, host) {
         crypto.getRandomValues(this.key);
         crypto.getRandomValues(this.iv);
 
-        this.domNode.key.textContent = `Key: ${this.TextKey()}`;
+        this.domNode.key.textContent = `Key: ${Utils.ArrayToHex(this.key)}`;
         return this.key;
     };
 
@@ -314,7 +314,7 @@ function FileUpload(file, host) {
     this.UploadData = async function (fileData) {
         this.uploadStats.lastProgress = new Date().getTime();
         this.HandleProgress('state-upload-start');
-        
+
         let uploadResult = await XHR("POST", `${window.location.protocol}//${this.host}/upload`, fileData, { "Content-Type": "application/octet-stream" }, function (ev) {
             let now = new Date().getTime();
             let dxLoaded = ev.loaded - this.uploadStats.lastLoaded;
@@ -406,12 +406,12 @@ function FileUpload(file, host) {
         let header = JSON.stringify(this.CreateHeader());
 
         let vbf_stream = {
-            type: "bytes",
-            autoAllocateChunkSize: 16 * 1024,
+            self: this,
+            header,
             start(controller) {
                 this.self.HandleProgress('state-load-start');
                 this.offset = 0;
-                this.chunkSize = 16 * 1024;
+                this.chunkSize = 32 * 1024;
                 this.aes = new AES_CBC(this.self.key, this.self.iv, true);
                 this.hmac = new HmacSha256(this.self.key);
 
@@ -420,52 +420,62 @@ function FileUpload(file, host) {
                 Log.I(`Using header: ${this.header} (length=${this.header_data.byteLength})`);
             },
             pull(controller) {
-                let read_now = this.chunkSize;
-                if(this.offset === 0) {
-                    controller.enqueue(VBF.CreateV2Start());
-                    read_now -= this.header_data.byteLength;
-                } else if(this.offset === this.self.file.size) {
-                    //done, send last encrypted part and hmac
-                    controller.enqueue(this.self.aes.AES_Encrypt_finish());
-                    this.self.hmac.finish();
-                    controller.enqueue(this.self.hmac.hash);
-                    controller.close();
-                }
+                return (async function () {
+                    debugger;
+                    while (true) {
+                        let read_now = this.chunkSize;
+                        if (this.offset === 0) {
+                            controller.enqueue(VBF.CreateV2Start());
+                            read_now -= this.header_data.byteLength;
+                        }
 
-                //read file slice
-                return new Promise((resolve, reject) => {
-                    let file_to_read = this.self.file.slice(this.offset, this.offset + read_now);
-                    let fr = new FileReader();
-                    fr.onload = function(ev) {
-                        let buf = null;
-                        if(ev.target.self.offset === 0){
-                            buf = new Uint8Array(ev.target.self.header_data.byteLength + ev.target.result.byteLength);
-                            buf.set(ev.target.self.header_data, 0);
-                            buf.set(ev.target.result, ev.target.self.header_data.byteLength);
+                        let file_to_read = this.self.file.slice(this.offset, this.offset + read_now);
+                        let data = await new Promise(function (resolve, reject) {
+                            let fr = new FileReader();
+                            fr.onload = function (ev) {
+                                resolve(ev.target.result);
+                            }
+                            fr.onerror = function (ev) { reject(); }
+                            fr.readAsArrayBuffer(file_to_read);
+                        });
+
+                        //check is eof
+                        if (this.offset + data.byteLength === this.self.file.size) {
+                            //done, send last encrypted part and hmac
+                            this.hmac.process(data);
+                            controller.enqueue(this.aes.AES_Encrypt_process(data));
+
+                            controller.enqueue(this.aes.AES_Encrypt_finish());
+                            this.hmac.finish();
+                            controller.enqueue(this.hmac.result);
+                            controller.close();
+                            return;
+                        }
+
+                        var buf = null;
+                        if (this.offset === 0) {
+                            buf = new Uint8Array(2 + this.header_data.byteLength + data.byteLength);
+                            let hlen = new Uint16Array(1);
+                            hlen[0] = this.header_data.byteLength;
+
+                            buf.set(hlen, 0)
+                            buf.set(this.header_data, hlen.byteLength);
+                            buf.set(data, hlen.byteLength + this.header_data.byteLength);
                         } else {
-                            buf = ev.target.result;
+                            buf = new Uint8Array(data);
                         }
 
                         //hash the buffer
-                        ev.target.self.hmac.process(buf);
+                        this.hmac.process(buf);
 
                         //encrypt the buffer
-                        controller.enqueue(ev.target.self.aes.AES_Encrypt_process(buf));
+                        controller.enqueue(this.aes.AES_Encrypt_process(buf));
 
-                        ev.target.self.offset += buf.byteLength;
-                        resolve();
+                        //add offset bytes to fileread
+                        this.offset += data.byteLength;
                     }
-                    fr.onerror = function(ev) { reject(); }
-
-                    fr.self = this;
-                    fr.readAsArrayBuffer(file_to_read);
-                });
-            },
-            cancel() {
-
-            },
-            self: this,
-            header
+                }.bind(this))();
+            }
         };
 
         let file_stream = new ReadableStream(vbf_stream);
diff --git a/src/php/init.php b/src/php/init.php
index 93f432e..143c4ff 100644
--- a/src/php/init.php
+++ b/src/php/init.php
@@ -1,5 +1,6 @@
 <?php
     define('REDIS_CONFIG', 'redis-host');
+    define('REDIS_DB', 0);
     define('REDIS_PREFIX', 'vc:');
     define('USER_IP', isset($_SERVER['HTTP_CF_CONNECTING_IP']) ? $_SERVER['HTTP_CF_CONNECTING_IP'] : (isset($_SERVER['REMOTE_ADDR']) ? $_SERVER['REMOTE_ADDR'] : "127.0.0.1"));
 
diff --git a/src/php/staticredis.php b/src/php/staticredis.php
index a6ae986..0f793f8 100644
--- a/src/php/staticredis.php
+++ b/src/php/staticredis.php
@@ -29,6 +29,9 @@
                     return $con && $mcon;
                 }
             }
+            if(REDIS_DB !== 0 && $con){
+                self::$Instance->select(REDIS_DB);
+            }
             return $con;
         }
     }