diff --git a/Desktop_Interface/mainwindow.cpp b/Desktop_Interface/mainwindow.cpp
index 6b5ca66b..b778f184 100644
--- a/Desktop_Interface/mainwindow.cpp
+++ b/Desktop_Interface/mainwindow.cpp
@@ -1226,7 +1226,7 @@ void MainWindow::reinitUsb(void){
         reinitUsbStage2();
     } else{
         ui->controller_iso->driver->shutdownProcedure();
-        QTimer::singleShot(3500, this, SLOT(reinitUsbStage2()));
+        QTimer::singleShot(1000, this, SLOT(reinitUsbStage2()));
     }
 #endif
     qDebug() << "ReinitUsb Stage 1 complete";
diff --git a/Desktop_Interface/unixusbdriver.cpp b/Desktop_Interface/unixusbdriver.cpp
index 2a00b474..50e17700 100644
--- a/Desktop_Interface/unixusbdriver.cpp
+++ b/Desktop_Interface/unixusbdriver.cpp
@@ -18,9 +18,14 @@ unixUsbDriver::~unixUsbDriver(void){
     qDebug() << "\n\nunixUsbDriver destructor ran!";
     //unixDriverDeleteMutex.lock();
     if(connected){
-        workerThread->terminate();
+        workerThread->deleteLater();
+        while(workerThread->isRunning()){
+            workerThread->quit();
+            qDebug() << "isRunning?" << workerThread->isFinished();
+            QThread::msleep(100);
+        }
         delete(isoHandler);
-        delete(workerThread);
+        //delete(workerThread);
         qDebug() << "THREAD Gone!";
 
         for (int i=0; i<NUM_FUTURE_CTX; i++){
@@ -298,7 +303,7 @@ bool unixUsbDriver::allEndpointsComplete(int n){
 
 void unixUsbDriver::shutdownProcedure(){
     shutdownMode = true;
-    QTimer::singleShot(1500, this, SLOT(backupCleanup()));
+    QTimer::singleShot(100, this, SLOT(backupCleanup()));
 }
 
 //On physical disconnect, isoTimerTick will not assert stopTime.  Hence this duct-tape function.
diff --git a/Desktop_Interface/unixusbdriver.h b/Desktop_Interface/unixusbdriver.h
index 5cd9a605..fb1afd8f 100644
--- a/Desktop_Interface/unixusbdriver.h
+++ b/Desktop_Interface/unixusbdriver.h
@@ -33,11 +33,11 @@ public:
     ~worker(){};
     libusb_context *ctx;
     bool stopTime = false;
-    unsigned char cleanupRemaining = 2;
+    unsigned char cleanupRemaining = 4;
 public slots:
     void handle(){
         qDebug() << "SUB THREAD ID" << QThread::currentThreadId();
-        while(1){
+        while(cleanupRemaining){
             //qDebug() << cleanupRemaining;
             if(libusb_event_handling_ok(ctx)){
                 libusb_handle_events_timeout(ctx, &tv);
@@ -46,12 +46,11 @@ public slots:
             if(stopTime){
                 if(cleanupRemaining){
                     cleanupRemaining--;
-                }else while(1){
-                    QThread::msleep(100);
-                    //qDebug() << "Cleanup complete";  //THIS THREAD STILL EXISTS
+                    qDebug("Cleaning... #%hhu phases remain.\n", cleanupRemaining);
                 }
             }
         }
+        qDebug() << "Cleanup complete";  //THIS THREAD STILL EXISTS
     }
 };