diff --git a/README.md b/README.md
index 5375481..5ec7d0c 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Reno is an evolution of my previous configuration, https://512mb.org/git/Yessies
 
 Through advancements in the ~~science~~ dark magic art of lua metatablery, AWMTK2 makes it possible to create complex and visually rich themes, while mainting relatively low memory footprint.
 
-Thanks to the questionably ethical decisions of employing JSON to Widget Layout conversion, this desktop allows for customization of panels, context menus, lock screens, and other widget containers of various sizes and shapes.
+Thanks to the ethically questionable decision of employing JSON to Widget Layout conversion, this desktop allows for customization of panels, context menus, lock screens, and other widget containers of various sizes and shapes.
 
 ## Screenshots
 
diff --git a/libs/context_menu.lua b/libs/context_menu.lua
index ad5a850..52fb1d5 100644
--- a/libs/context_menu.lua
+++ b/libs/context_menu.lua
@@ -53,6 +53,7 @@ return function(args)
         }))
         local onpress = function(widget)
             style.button.onrelease(widget)
+            widget:emit_signal("cascade::kill")
             if root_layer.focused then
                 root_layer.focused:emit_signal("cascade::kill")
             end
diff --git a/modules/xdg_data.lua b/modules/xdg_data.lua
index 2733493..19ffcb2 100644
--- a/modules/xdg_data.lua
+++ b/modules/xdg_data.lua
@@ -16,7 +16,8 @@ menu_utils.wm_name = ""
 local desktop_dirs = {}
 local desktop_dirs_complete = 0
 local icon_dirs = {}
-(os.getenv("XDG_DATA_DIRS")..":/home/yessiest/.local/share"):gsub("[^:]*",function(path)
+((os.getenv("XDG_DATA_DIRS") or 
+ "/usr/share/applications:/usr/local/share/applications")..":/home/yessiest/.local/share"):gsub("[^:]*",function(path)
     if gears.filesystem.dir_readable(path.."/applications") then
         table.insert(desktop_dirs, path.."/applications")
     end
diff --git a/widgets/lockscreen.lua b/widgets/lockscreen.lua
index 4da8874..724488e 100644
--- a/widgets/lockscreen.lua
+++ b/widgets/lockscreen.lua
@@ -22,6 +22,7 @@ if not G_KeyboardLock then
         mask_event_callback = true
     }
 end
+local reset_textbox_timer
 
 local function _preload(args)
     local widget_root
@@ -135,6 +136,7 @@ local function _preload(args)
                 exe_callback = function(input,textbox)
                     G_KeyboardLock:start()
                     if simplepam(input) then
+                        pinentry:set_markup("Enter password")
                         awesome.emit_signal("unlock_screen")
                     else
                         pinentry:set_markup("Enter password")
diff --git a/widgets/rootcontrols.lua b/widgets/rootcontrols.lua
index 617cbd5..d4b1152 100644
--- a/widgets/rootcontrols.lua
+++ b/widgets/rootcontrols.lua
@@ -25,7 +25,7 @@ return function(args)
                 {"restart", function() awesome.restart() end},
                 {"quit", function() awesome.quit() end}
             }, beautiful.awesome_icon},
-            {"open terminal", global.terminal}
+            {"open terminal", global.terminal},
         },
     })
     return widget