diff --git a/lua/config/keymaping.lua b/lua/config/keymaping.lua
index 2fe10e7..43f0452 100644
--- a/lua/config/keymaping.lua
+++ b/lua/config/keymaping.lua
@@ -10,6 +10,16 @@ map({ "i", "n" }, "<C-v>", '"+p', { desc = "Past" })
 
 map("n", "<C-s>", ":w<CR>", { desc = "Save file" })
 
+map("n", "<C-S-left>", "<C-w>h", { desc = "switch window left" })
+map("n", "<C-S-right>", "<C-w>l", { desc = "switch window right" })
+map("n", "<C-S-down>", "<C-w>j", { desc = "switch window down" })
+map("n", "<C-S-up>", "<C-w>k", { desc = "switch window up" })
+
+map("n", "<C-q>", ":q<CR>", { desc = "close window" })
+
+map("n", "<C-/>", "gcc", { desc = "toggle comment", remap = true })
+map("v", "<C-/>", "gc", { desc = "toggle comment", remap = true })
+
 -- neo-tree
 map("n", "<leader>e", ":Neotree<CR>", { desc = "nvimtree focus window" })
 map("n", "<leader>g", ":Neotree git_status float<CR>", { desc = "open gis status" })
diff --git a/lua/config/options.lua b/lua/config/options.lua
index 8126b27..37e4b4c 100644
--- a/lua/config/options.lua
+++ b/lua/config/options.lua
@@ -5,6 +5,8 @@ local wo = vim.wo
 
 opt.fillchars = { eob = " " }
 
+opt.whichwrap:append("<>[]")
+
 g.mapleader = " "
 
 wo.signcolumn = "auto:2-3"