diff --git a/lua/ward/remap.lua b/lua/ward/remap.lua
index 4bb7ff4..3b0e7cd 100644
--- a/lua/ward/remap.lua
+++ b/lua/ward/remap.lua
@@ -3,8 +3,8 @@
 vim.g.mapleader = " "
 vim.g.maplocalleader = "\\"
 
-vim.keymap.set("n", "<leader>w", vim.cmd.w)
-vim.keymap.set("n", "<leader>q", vim.cmd.q)
+vim.keymap.set("n", "<leader>bw", vim.cmd.w, { desc = "Write buffer" })
+vim.keymap.set("n", "<leader>vq", vim.cmd.qall, { desc = "Quit vim" })
 vim.keymap.set("n", "<leader>bn", vim.cmd.bnext)
 vim.keymap.set("n", "<leader>n", vim.cmd.bnext)
 vim.keymap.set("n", "<leader>bp", vim.cmd.bprevious)
@@ -35,3 +35,4 @@ vim.keymap.set("n", "N", [[Nzz]])
 vim.keymap.set({ "i", "c" }, "<C-S-V>", '<C-R>+', { desc = "Paste system clipboard" })
 vim.keymap.set({ "n", "x", "c", "v" }, "<C-S-C>", '"+y', { desc = "Copy system clipboard" })
 -- vim.keymap.set({ "n", "x" }, "<C-S-V>", '"+p', { desc = "Paste system clipboard" })
+vim.keymap.set({ "n", "x", "c", "v" }, "<C-S>", vim.cmd.w)
diff --git a/lua/ward/setup.lua b/lua/ward/setup.lua
index 600d60b..40b496a 100644
--- a/lua/ward/setup.lua
+++ b/lua/ward/setup.lua
@@ -17,8 +17,8 @@ vim.opt.wrap = false
 --vim.opt.colorcolumn= 110
 vim.api.nvim_set_option_value("colorcolumn", "110", {})
 
-vim.opt.confirm = true
-vim.opt.hlsearch = true
+vim.opt.confirm = true -- confirm on quit with unsave changes
+vim.opt.hlsearch = true -- highlight search
 vim.opt.incsearch = true -- incremental search
 
 vim.opt.termguicolors = true