diff --git a/sys/apis/ui.lua b/sys/apis/ui.lua
index d8cf30b..5e6fb7e 100644
--- a/sys/apis/ui.lua
+++ b/sys/apis/ui.lua
@@ -344,9 +344,9 @@ function Manager:click(button, x, y)
     if button == 1 then
       local c = os.clock()
 
-      if self.doubleClickTimer then
-        debug(c - self.doubleClickTimer)
-      end
+      --if self.doubleClickTimer then
+      --  debug(c - self.doubleClickTimer)
+      --end
 
       if self.doubleClickTimer and (c - self.doubleClickTimer < 1.9) and
          self.doubleClickX == x and self.doubleClickY == y and
diff --git a/sys/apps/Files.lua b/sys/apps/Files.lua
index cc38b38..e1ee80b 100644
--- a/sys/apps/Files.lua
+++ b/sys/apps/Files.lua
@@ -5,9 +5,6 @@ local Event  = require('event')
 local UI     = require('ui')
 local Util   = require('util')
 
-local cleanEnv = Util.shallowCopy(getfenv(1))
-cleanEnv.require = nil
-
 multishell.setTitle(multishell.getCurrent(), 'Files')
 UI:configure('Files', ...)
 
@@ -265,7 +262,7 @@ function Browser:setDir(dirName, noStatus)
 end
 
 function Browser:run(path, ...)
-  local tabId = multishell.launch(cleanEnv, path, ...)
+  local tabId = shell.openTab(path, ...)
   multishell.setFocus(tabId)
 end
 
@@ -288,7 +285,7 @@ function Browser:eventHandler(event)
     Event.exitPullEvents()
 
   elseif event.type == 'edit' and file then
-    self:run('sys/apps/shell', 'edit', file.name)
+    self:run('edit', file.name)
 
   elseif event.type == 'shell' then
     self:run('sys/apps/shell')
@@ -340,7 +337,7 @@ function Browser:eventHandler(event)
       if file.isDir then
         self:setDir(file.fullName)
       else
-        self:run('sys/apps/shell', file.name)
+        self:run(file.name)
       end
     end
 
diff --git a/sys/apps/shell b/sys/apps/shell
index cd832f2..c4c0d8e 100644
--- a/sys/apps/shell
+++ b/sys/apps/shell
@@ -177,14 +177,6 @@ function shell.getRunningProgram()
   return tProgramStack[#tProgramStack]
 end
 
-function shell.set(name, value)
-  getfenv(1)[name] = value
-end
-
-function shell.get(name)
-  return getfenv(1)[name]
-end
-
 function shell.setAlias( _sCommand, _sProgram )
   ALIASES[ _sCommand ] = _sProgram
 end
@@ -208,9 +200,13 @@ function shell.newTab(tabInfo, ...)
   if path then
     tabInfo.path = path
     tabInfo.env = sandboxEnv
-    tabInfo.args = args
+    tabInfo.args = Util.shallowCopy(args)
     tabInfo.title = fs.getName(path)
 
+    if path ~= 'sys/apps/shell' then
+      table.insert(tabInfo.args, 1, tabInfo.path)
+      tabInfo.path = 'sys/apps/shell'
+    end
     return multishell.openTab(tabInfo)
   end
   return nil, 'No such program'
diff --git a/sys/boot/multishell.boot b/sys/boot/multishell.boot
index bbeca44..a5888a4 100644
--- a/sys/boot/multishell.boot
+++ b/sys/boot/multishell.boot
@@ -25,7 +25,9 @@ if mounts then
   end
 end
 
-fs.mount('usr', 'gitfs', 'kepler155c/opus-apps/develop')
+pcall(function()
+  fs.mount('usr', 'gitfs', 'kepler155c/opus-apps/develop')
+end)
 
 -- user environment
 if not fs.exists('usr/apps') then