diff --git a/lua/core/autocmd.lua b/lua/core/autocmd.lua
index 06c6958..08d5d93 100644
--- a/lua/core/autocmd.lua
+++ b/lua/core/autocmd.lua
@@ -18,3 +18,15 @@ vim.api.nvim_create_autocmd({"BufWinEnter"}, {
   desc = "load view (folds), when opening file",
   command = "silent! loadview"
 })
+
+vim.api.nvim_create_autocmd("WinEnter", {
+    callback = function()
+        vim.wo.cursorline = true
+    end,
+})
+
+vim.api.nvim_create_autocmd("WinLeave", {
+    callback = function()
+        vim.wo.cursorline = false
+    end,
+})
diff --git a/lua/core/remap.lua b/lua/core/remap.lua
index 4b0fa59..3145076 100644
--- a/lua/core/remap.lua
+++ b/lua/core/remap.lua
@@ -19,6 +19,8 @@ vim.api.nvim_set_keymap("n", "<C-l>", "<C-w>l", {})
 -- buffer operations
 vim.api.nvim_set_keymap("n", "<leader><tab>", "<C-^>", {})
 vim.api.nvim_set_keymap("n", "<leader>bd", "<cmd>bd<cr>", {})
+vim.api.nvim_set_keymap("n", "<leader>bn", "<cmd>bnext<cr>", {})
+vim.api.nvim_set_keymap("n", "<leader>bp", "<cmd>bprevious<cr>", {})
 
 -- quickfix and locationlist
 vim.api.nvim_set_keymap("n", "<S-h>", "<cmd>cnext<cr>zz", {})
diff --git a/lua/core/settings.lua b/lua/core/settings.lua
index 55a2adb..10897c2 100644
--- a/lua/core/settings.lua
+++ b/lua/core/settings.lua
@@ -73,4 +73,8 @@ vim.opt.backup = false
 vim.opt.undodir = os.getenv("HOME") .. "/.local/share/nvim/undodir"
 vim.opt.undofile = true
 
-vim.opt.shortmess = "I"
+-- message options
+vim.opt.shortmess = "aItTF"
+
+-- hide buffers instead of closing
+vim.opt.hidden = true
diff --git a/lua/plugin/lsp.lua b/lua/plugin/lsp.lua
index 85c5872..ae3103e 100644
--- a/lua/plugin/lsp.lua
+++ b/lua/plugin/lsp.lua
@@ -85,7 +85,6 @@ return {
                     null_ls.builtins.code_actions.gitrebase,
                     null_ls.builtins.diagnostics.checkmake,
                     null_ls.builtins.diagnostics.cmake_lint,
-                    null_ls.builtins.diagnostics.cppcheck,
                     null_ls.builtins.diagnostics.yamllint,
                     null_ls.builtins.diagnostics.sqlfluff.with({
                         extra_args = { "--dialect", "sqlite" },