diff --git a/sys/apis/entry.lua b/sys/apis/entry.lua
index 992e967..fd77af9 100644
--- a/sys/apis/entry.lua
+++ b/sys/apis/entry.lua
@@ -132,7 +132,7 @@ function Entry:process(ie)
 
 	elseif ie.code == 'mouse_click' then
 		-- need starting x passed in instead of hardcoding 3
-		self.pos = math.min(ie.x - 3 + self.scroll, #self.value)
+		self.pos = math.max(0, math.min(ie.x - 3 + self.scroll, #self.value))
 		updated = true
 
 	elseif ie.code == 'mouse_rightclick' then
diff --git a/sys/apis/terminal.lua b/sys/apis/terminal.lua
index 6cdacbd..950741e 100644
--- a/sys/apis/terminal.lua
+++ b/sys/apis/terminal.lua
@@ -323,8 +323,9 @@ function Terminal.copy(it, ot)
 end
 
 function Terminal.mirror(ct, dt)
+	local t = { }
 	for k,f in pairs(ct) do
-		ct[k] = function(...)
+		t[k] = function(...)
 			local ret = { f(...) }
 			if dt[k] then
 				dt[k](...)
@@ -332,6 +333,7 @@ function Terminal.mirror(ct, dt)
 			return table.unpack(ret)
 		end
 	end
+	return t
 end
 
 function Terminal.readPassword(prompt)
diff --git a/sys/apps/system/kiosk.lua b/sys/apps/system/kiosk.lua
index aac7954..0eda77b 100644
--- a/sys/apps/system/kiosk.lua
+++ b/sys/apps/system/kiosk.lua
@@ -30,7 +30,7 @@ function tab:enable()
 
 	for k,v in pairs(device) do
 		if v.type == 'monitor' then
-			table.insert(choices, { name = k, value = v.name })
+			table.insert(choices, { name = k, value = v.side })
 		end
 	end
 
@@ -44,8 +44,12 @@ end
 
 function tab:eventHandler(event)
 	if event.type == 'choice_change' then
-		settings.set('kiosk.monitor', self.form.monitor.value)
-		settings.set('kiosk.textscale', self.form.textScale.value)
+		if self.form.monitor.value then
+			settings.set('kiosk.monitor', self.form.monitor.value)
+		end
+		if self.form.textScale.value then
+			settings.set('kiosk.textscale', self.form.textScale.value)
+		end
 		settings.save('.settings')
 	end
 end
diff --git a/sys/extensions/7.multishell.lua b/sys/extensions/7.multishell.lua
index 271cded..ea7e5c3 100644
--- a/sys/extensions/7.multishell.lua
+++ b/sys/extensions/7.multishell.lua
@@ -139,7 +139,7 @@ function multishell.openTab(tab)
 			if err then
 				printError(tostring(err))
 				if stacktrace then -- alternatively log stack to _debug
-					print(stacktrace)
+					print('\n' .. stacktrace)
 				end
 			end
 			print('\nPress enter to close')