diff --git a/src/iTender.ts b/src/iTender.ts
index f7ad444..210515d 100644
--- a/src/iTender.ts
+++ b/src/iTender.ts
@@ -119,6 +119,10 @@ export class iTender {
 
             job.drink = drink
             job.amounts = amounts as { ingredient: IIngredient, amount: number, container: IContainer }[];
+            if( job.estimatedTime < 0.5 )
+            {
+                job.estimatedTime = 1;
+            }
             await job.save()
             resolve(job);
 
@@ -145,7 +149,7 @@ export class iTender {
             } catch (e) {
                 if (isPI()) {
                     log("[ERROR] GPIO I/O Error " + e);
-                    iTender.cancelFill();
+                    await iTender.cancelFill();
                     return;
                 } else {
                     log("[WARNING] GPIO I/O Error, but it's normal cause you are not on raspberry");
@@ -173,7 +177,7 @@ export class iTender {
                 } catch (e) {
                     if (isPI()) {
                         log("[ERROR] GPIO I/O Error " + e);
-                        iTender.cancelFill();
+                        await iTender.cancelFill();
                         return;
                     } else {
                         log("[WARNING] GPIO I/O Error, but it's normal cause you are not on raspberry");
@@ -196,7 +200,8 @@ export class iTender {
             job.successful = true;
             await job.save();
             mixLog("Job successful");
-            iTender.setStatus(iTenderStatus.READY);
+            setTimeout( () => iTender.setStatus(iTenderStatus.READY), 3000 )
+
         }, 500);
     }
 
diff --git a/src/web/WebWebSocketHandler.ts b/src/web/WebWebSocketHandler.ts
index ee2dfac..ec8f6df 100644
--- a/src/web/WebWebSocketHandler.ts
+++ b/src/web/WebWebSocketHandler.ts
@@ -63,7 +63,7 @@ export class WebWebSocketHandler {
                     case iTenderStatus.READY: {
                         Modal.close("start");
                         Modal.close("setup");
-                        //Modal.close("fill");
+                        Modal.close("fill");
                         Modal.close("download");
                         if (WebHandler.currentPane != Pane.MENU)
                             WebHandler.openPane(Pane.MAIN);
@@ -193,7 +193,7 @@ export class WebWebSocketHandler {
                                     cancelBtn.onclick = () => {
                                         modal.close();
                                     }
-                                    setTimeout(() => modal.close(), 1000 * 4.5);
+                                    //setTimeout(() => modal.close(), 1000 * 4.5);
                                 }, job.estimatedTime * 1000);
                             });
                         });