diff --git a/screenSaver/autorun/saver.lua b/screenSaver/autorun/saver.lua
index 5caca8d..274b82f 100644
--- a/screenSaver/autorun/saver.lua
+++ b/screenSaver/autorun/saver.lua
@@ -39,7 +39,7 @@ local function showScreenSaver()
     })
 end
 
-kernel.hook({ 'mouse_up', 'mouse_drag', 'key_up' }, function()
+kernel.hook({ 'mouse_up', 'mouse_drag', 'key_up', 'mouse_scroll' }, function()
     if config.enabled then
         if timer then
             os.cancelTimer(timer)
diff --git a/screenSaver/etc/fstab b/screenSaver/etc/fstab
index 8811c66..2c02cfd 100644
--- a/screenSaver/etc/fstab
+++ b/screenSaver/etc/fstab
@@ -3,6 +3,9 @@ packages/screenSaver/savers/timespace.lua urlfs https://raw.githubusercontent.co
 packages/screenSaver/savers/visualizer.lua urlfs https://raw.githubusercontent.com/Allen2277/Computercraft/master/ScreenSaver
 packages/screenSaver/savers/random.lua urlfs https://pastebin.com/raw/XXW0r5zt
 packages/screenSaver/savers/melting.lua urlfs http://pastebin.com/raw/raUv6Pap
-packages/screenSaver/savers/bubbles.lua urlfs https://pastebin.com/raw/3CeFxk9X
+packages/screenSaver/savers/bubbles.lua urlfs https://pastebin.com/raw/JCR8YTww
 packages/screenSaver/savers/fire.lua urlfs https://pastebin.com/raw/4CY4AYj3
-packages/screenSaver/savers/rain.lua urlfs https://pastebin.com/raw/P86Hm99N
\ No newline at end of file
+packages/screenSaver/savers/rain.lua urlfs https://pastebin.com/raw/P86Hm99N
+packages/screenSaver/savers/snow.lua urlfs https://pastebin.com/raw/j1dwdLKw
+packages/screenSaver/savers/fireworks.lua urlfs https://pastebin.com/raw/Yn5sWt3f
+packages/screenSaver/savers/starfield.lua urlfs https://pastebin.com/raw/AQm9R6nT
\ No newline at end of file
diff --git a/secure/autorun/lock.lua b/secure/autorun/lock.lua
index e4ec30d..f951dfc 100644
--- a/secure/autorun/lock.lua
+++ b/secure/autorun/lock.lua
@@ -92,7 +92,7 @@ keyboard.addHotkey('control-l', function()
     end
 end)
 
-kernel.hook({ 'mouse_click', 'mouse_up', 'mouse_drag', 'key_up', 'key' }, function()
+kernel.hook({ 'mouse_up', 'mouse_drag', 'key_up', 'mouse_scroll' }, function()
     if timer then
         os.cancelTimer(timer)
         timer = os.startTimer(config.timeout)
diff --git a/secure/unlock.lua b/secure/unlock.lua
index 0a1c9d7..6fc5e58 100644
--- a/secure/unlock.lua
+++ b/secure/unlock.lua
@@ -19,11 +19,7 @@ repeat
     local s, m = pcall(function()
         local password = Terminal.readPassword('Enter password: ')
 
-        if not password then
-            error('Invalid password')
-        end
-
-        if Security.verifyPassword(SHA.compute(password or '')) then
+        if password and Security.verifyPassword(SHA.compute(password)) then
             return true
         end
         error('Invalid password')