diff --git a/common/neovim/lua/keymap.lua b/common/neovim/lua/keymap.lua
index b62a651..bdaaf61 100644
--- a/common/neovim/lua/keymap.lua
+++ b/common/neovim/lua/keymap.lua
@@ -32,6 +32,12 @@ local keymap = {
 		['<expr> n'] = "'Nn'[v:searchforward]",
 		['<expr> N'] = "'nN'[v:searchforward]",
 		['<c-m>'] = ':lua SynGroup()<cr>',
+
+		['<leader>s'] = "<cmd>SessionToggle<cr><cmd>echo 'Persisting Session: ' .. g:persisting .. ' (' .. getcwd() .. ')'<cr>",
+		['<leader>S'] = "<cmd>SessionSave<cr><cmd>echo 'Saved Session: ' .. getcwd()<cr>",
+		['<leader>l'] = "<cmd>SessionLoad<cr><cmd>echo 'Loaded Session: ' .. getcwd()<cr>",
+		['<leader>L'] = "<cmd>SessionLoadLast<cr><cmd>echo 'Loaded Last Session: ' .. getcwd()<cr>",
+		['<leader>d'] = "<cmd>SessionDelete<cr><cmd>echo 'Deleted Session for cwd: ' .. getcwd()<cr>",
 	},
 
 	-- terminal bindings
diff --git a/common/neovim/lua/options.lua b/common/neovim/lua/options.lua
index b273be9..72896a0 100644
--- a/common/neovim/lua/options.lua
+++ b/common/neovim/lua/options.lua
@@ -51,10 +51,10 @@ local options = {
 	shortmess = 'filnxToOFIac',
 	history = 1000,
 	undofile = true,
-	undodir = vim.g.vimdir .. '/undo',
+	undodir = vim.fn.stdpath'data' .. '/undo',
 	undolevels = 1000,
 	undoreload = 1000,
-	spellfile = vim.g.vimdir .. '/spell/en.utf-8.add',
+	spellfile = vim.fn.stdpath'data' .. '/spell/en.utf-8.add',
 	ignorecase = true,
 	smartcase = true,
 	incsearch = true,
diff --git a/common/neovim/lua/plugins.lua b/common/neovim/lua/plugins.lua
index bbcab19..f61425a 100644
--- a/common/neovim/lua/plugins.lua
+++ b/common/neovim/lua/plugins.lua
@@ -23,9 +23,10 @@ packer.startup(function()
 			-- session management
 			'olimorris/persisted.nvim',
 			config = function()
-				-- TODO: only load session if no arguments passed?
+				local should_autoload = #vim.v.argv == 1
 				require'persisted'.setup{
-					autoload = true,
+					autoload = should_autoload,
+					autosave = should_autoload,
 				}
 			end
 		},