diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua
index 7e288b8..564eb51 100644
--- a/lua/user/keymaps.lua
+++ b/lua/user/keymaps.lua
@@ -44,8 +44,8 @@ end
 keymap("n", "<leader>h", "<cmd>nohlsearch<CR>", opts)
 
 -- Close buffers
-keymap("n", "<S-q>", "<cmd>Bdelete<CR>", opts)
-keymap("n", "<S-q>", "<cmd>Bdelete!<CR>", opts)
+keymap("n", "<M-q>", "<cmd>Bdelete<CR>", opts)
+keymap("n", "<M-Q>", "<cmd>Bdelete!<CR>", opts)
 
 -- Better paste
 keymap("v", "p", '"_dP', opts)
@@ -74,8 +74,8 @@ keymap("n", "<leader>fb", ":Telescope buffers<CR>", opts)
 --keymap("n", "<leader>gg", "<cmd>lua _LAZYGIT_TOGGLE()<CR>", opts)
 
 -- Comment
-keymap("n", "<leader>/", "<cmd>lua require('Comment.api').toggle_current_linewise()<CR>", opts)
-keymap("x", "<leader>/", '<ESC><CMD>lua require("Comment.api").toggle_linewise_op(vim.fn.visualmode())<CR>')
+keymap("n", "<leader>/", "<cmd>lua require('Comment.api').toggle_current_linewise()<cr>", opts)
+keymap("x", "<leader>/", '<esc><cmd>lua require("Comment.api").toggle_linewise_op(vim.fn.visualmode())<cr>')
 
 -- DAP
 keymap("n", "<F9>", "<cmd>lua require'dap'.toggle_breakpoint()<cr>", opts)
@@ -99,10 +99,8 @@ keymap("n", "<F17>", "<cmd>lua require'dap'.terminate()<cr>", opts) -- Shift+F5
 --keymap("n", "<leader>di", "<Plug>VimspectorBalloonEval", opts)
 
 -- move.vim
--- Normal-mode commands
-vim.keymap.set('n', '<A-j>', ':MoveLine(1)<CR>', opts)
-vim.keymap.set('n', '<A-k>', ':MoveLine(-1)<CR>', opts)
+vim.keymap.set('n', '<A-j>', '<cmd>MoveLine(1)<cr>', opts)
+vim.keymap.set('n', '<A-k>', '<cmd>MoveLine(-1)<cr>', opts)
+vim.keymap.set('v', '<A-j>', '<cmd>MoveBlock(1)<cr>', opts)
+vim.keymap.set('v', '<A-k>', '<cmd>MoveBlock(-1)<cr>', opts)
 
--- Visual-mode commands
-vim.keymap.set('v', '<A-j>', ':MoveBlock(1)<CR>', opts)
-vim.keymap.set('v', '<A-k>', ':MoveBlock(-1)<CR>', opts)