diff --git a/atom-lib/finder-window.js b/atom-lib/finder-window.js
index 96023702..8d341b7b 100644
--- a/atom-lib/finder-window.js
+++ b/atom-lib/finder-window.js
@@ -8,6 +8,7 @@ const Tray = electron.Tray
 const path = require('path')
 const nodeIpc = require('@rokt33r/node-ipc')
 
+var appQuit = false
 var isFinderLoaded = false
 
 nodeIpc.config.id = 'finder'
@@ -18,35 +19,37 @@ nodeIpc.connectTo(
   'main',
   path.join(app.getPath('userData'), 'boost.service'),
   function () {
-      nodeIpc.of.main.on(
-        'error',
-        function (err) {
-          nodeIpc.log('<< ## err ##'.rainbow, nodeIpc.config.delay)
-          nodeIpc.log(err)
+    nodeIpc.of.main.on(
+      'error',
+      function (err) {
+        nodeIpc.log('<< ## err ##'.rainbow, nodeIpc.config.delay)
+        nodeIpc.log(err)
+      }
+    )
+    nodeIpc.of.main.on(
+      'connect',
+      function () {
+        nodeIpc.log('<< ## connected to world ##'.rainbow, nodeIpc.config.delay)
+      }
+    )
+    nodeIpc.of.main.on(
+      'disconnect',
+      function () {
+        nodeIpc.log('<< disconnected from main'.notice)
+        appQuit = true
+        app.quit()
+      }
+    )
+    nodeIpc.of.main.on(
+      'message',
+      function (payload) {
+        switch (payload.type) {
+          case 'open-finder':
+            if (isFinderLoaded) openFinder()
+            break
         }
-      )
-      nodeIpc.of.main.on(
-        'connect',
-        function () {
-          nodeIpc.log('<< ## connected to world ##'.rainbow, nodeIpc.config.delay)
-        }
-      )
-      nodeIpc.of.main.on(
-        'disconnect',
-        function(){
-          nodeIpc.log('<< disconnected from main'.notice)
-        }
-      )
-      nodeIpc.of.main.on(
-        'message',
-        function (payload) {
-          switch (payload.type) {
-            case 'open-finder':
-              if (isFinderLoaded) openFinder()
-              break
-          }
-        }
-      )
+      }
+    )
   }
 )
 
@@ -91,6 +94,12 @@ finderWindow.on('blur', function () {
   hideFinder()
 })
 
+finderWindow.on('close', function (e) {
+  if (appQuit) return true
+  e.preventDefault()
+  finderWindow.hide()
+})
+
 finderWindow.webContents.on('did-finish-load', function () {
   var appIcon = new Tray(path.join(__dirname, '../resources/tray-icon.png'))
   appIcon.setToolTip('Boost')
@@ -112,7 +121,8 @@ finderWindow.webContents.on('did-finish-load', function () {
     label: 'Quit',
     click: function () {
       emit('quit-app')
-    }  }))
+    }
+  }))
 
   appIcon.setContextMenu(trayMenu)
   appIcon.on('click', function (e) {
diff --git a/finder.js b/finder.js
index e90edb8a..b2fcc086 100755
--- a/finder.js
+++ b/finder.js
@@ -4,7 +4,6 @@ const Menu = electron.Menu
 
 var finderWindow = null
 
-var appQuit = false
 app.on('ready', function () {
   if (process.platform === 'darwin') {
     app.dock.hide()
@@ -15,10 +14,4 @@ app.on('ready', function () {
   Menu.setApplicationMenu(menu)
 
   finderWindow = require('./atom-lib/finder-window')
-
-  finderWindow.on('close', function (e) {
-    if (appQuit) return true
-    e.preventDefault()
-    finderWindow.hide()
-  })
 })
diff --git a/main.js b/main.js
index 14355004..ed2ddcdb 100644
--- a/main.js
+++ b/main.js
@@ -94,7 +94,7 @@ var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory)
 })
 
 if (shouldQuit) {
-  app.quit()
+  quitApp()
   return
 }
 
@@ -114,82 +114,71 @@ function notify (title, body) {
 }
 
 var isUpdateReady = false
-if (process.platform === 'darwin') {
-  autoUpdater.setFeedURL('https://orbital.b00st.io/rokt33r/boost-app/latest?version=' + version)
-  autoUpdater
-    .on('update-downloaded', function (event, releaseNotes, releaseName, releaseDate, updateUrl, quitAndUpdate) {
-      update = quitAndUpdate
+var GhReleases = require('electron-gh-releases')
 
-      if (mainWindow != null) {
-        notify('Ready to Update! ' + releaseName, 'Click update button on Main window.')
-        mainWindow.webContents.send('update-available', 'Update available!')
-      }
-    })
-    .on('error', function (err, message) {
-      console.error('error')
+var ghReleasesOpts = {
+  repo: 'BoostIO/boost-releases',
+  currentVersion: app.getVersion()
+}
+
+const updater = new GhReleases(ghReleasesOpts)
+
+// Check for updates
+// `status` returns true if there is a new update available
+function checkUpdate () {
+  updater.check((err, status) => {
+    if (err) {
       console.error(err)
-      if (!versionNotified) {
-        notify('Updater error!', message)
-      }
-    })
-    .on('update-available', function () {
-      notify('Update is available!', 'Download started.. wait for the update ready.')
-    })
-    .on('update-not-available', function () {
-      if (!versionNotified) {
-        versionNotified = true
-        notify('Latest Build!! ' + versionText, 'Hope you to enjoy our app :D')
-      }
-    })
-} else if (process.platform === 'win32') {
-  var GhReleases = require('electron-gh-releases')
-
-  var ghReleasesOpts = {
-    repo: 'BoostIO/boost-releases',
-    currentVersion: app.getVersion()
-  }
-
-  const updater = new GhReleases(ghReleasesOpts)
-
-  // Check for updates
-  // `status` returns true if there is a new update available
-  function checkUpdate () {
-    updater.check((err, status) => {
-      if (err) {
-        console.error(err)
-        if (!versionNotified) notify('Updater error!', message)
-      }
-      if (!err) {
-        if (status) {
-          notify('Update is available!', 'Download started.. wait for the update ready.')
-          updater.download()
-        } else {
-          if (!versionNotified) {
-            versionNotified = true
-            notify('Latest Build!! ' + versionText, 'Hope you to enjoy our app :D')
-          }
+      if (!versionNotified) notify('Updater error!', message)
+    }
+    if (!err) {
+      if (status) {
+        notify('Update is available!', 'Download started.. wait for the update ready.')
+        updater.download()
+      } else {
+        if (!versionNotified) {
+          versionNotified = true
+          notify('Latest Build!! ' + versionText, 'Hope you to enjoy our app :D')
         }
       }
-    })
-  }
-
-  updater.on('update-downloaded', (info) => {
-    if (mainWindow != null) {
-      notify('Ready to Update!', 'Click update button on Main window.')
-      mainWindow.webContents.send('update-available', 'Update available!')
-      isUpdateReady = true
     }
   })
 }
 
+updater.on('update-downloaded', (info) => {
+  if (mainWindow != null) {
+    notify('Ready to Update!', 'Click update button on Main window.')
+    mainWindow.webContents.send('update-available', 'Update available!')
+    isUpdateReady = true
+  }
+})
+
 const nodeIpc = require('@rokt33r/node-ipc')
 nodeIpc.config.id = 'node'
 nodeIpc.config.retry = 1500
 // nodeIpc.config.silent = true
 
+function spawnFinder() {
+  if (process.platform === 'darwin') {
+    var finderArgv = [path.join(__dirname, 'finder.js'), '--finder']
+    if (_.find(process.argv, a => a === '--hot')) finderArgv.push('--hot')
+    finderProcess = ChildProcess
+      .execFile(process.execPath, finderArgv)
+  }
+}
+
 nodeIpc.serve(
   path.join(app.getPath('userData'), 'boost.service'),
   function () {
+    nodeIpc.server.on(
+      'connect',
+      function (socket) {
+        socket.on('close', function () {
+          console.log('socket dead')
+          if (!appQuit) spawnFinder()
+        })
+      }
+    )
     nodeIpc.server.on(
       'message',
       function (data, socket) {
@@ -209,8 +198,12 @@ nodeIpc.serve(
 function format (payload) {
   switch (payload.type) {
     case 'show-main-window':
-      mainWindow.minimize()
-      mainWindow.restore()
+      if (process.platform === 'darwin') {
+        mainWindow.show()
+      } else {
+        mainWindow.minimize()
+        mainWindow.restore()
+      }
       break
     case 'copy-finder':
       mainWindow.webContents.send('copy-finder')
@@ -220,6 +213,7 @@ function format (payload) {
       break
   }
 }
+
 function quitApp () {
   appQuit = true
   if (finderProcess) finderProcess.kill()
@@ -228,8 +222,9 @@ function quitApp () {
 
 app.on('ready', function () {
   app.on('before-quit', function () {
-    if (finderProcess) finderProcess.kill()
+    console.log('before quite')
     appQuit = true
+    if (finderProcess) finderProcess.kill()
   })
 
   var template = require('./atom-lib/menu-template')
@@ -281,10 +276,7 @@ app.on('ready', function () {
 
   mainWindow.webContents.on('did-finish-load', function () {
     if (finderProcess == null && process.platform === 'darwin') {
-      var finderArgv = [path.join(__dirname, 'finder.js'), '--finder']
-      if (_.find(process.argv, a => a === '--hot')) finderArgv.push('--hot')
-      finderProcess = ChildProcess
-        .execFile(process.execPath, finderArgv)
+      spawnFinder()
     } else {
       finderWindow = require('./atom-lib/finder-window')