diff --git a/lua/core.lua b/lua/core.lua
index 5d7d561..776cc7c 100644
--- a/lua/core.lua
+++ b/lua/core.lua
@@ -15,6 +15,7 @@ o.scrolloff = 10
 o.showmode = false
 o.termguicolors = true
 o.title = true
+vim.opt.diffopt = { "internal", "filler", "closeoff", "iwhite" }
 
 -- controlling
 global.mapleader = ' '
@@ -22,7 +23,7 @@ o.autoindent = true
 o.ignorecase = true
 o.smartcase = true
 o.smartindent = true
-vim.opt.completeopt = { 'menu', 'menuone', 'noselect' }
+vim.opt.completeopt = { 'menu', 'menuone', 'noselect', 'noinsert' }
 
 -- vscode
 if vim.g.vscode then
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
index d20a1f8..2970a2d 100644
--- a/lua/plugins/treesitter.lua
+++ b/lua/plugins/treesitter.lua
@@ -72,20 +72,13 @@ require("nvim-treesitter.configs").setup({
 			goto_previous_start = {
 				["[m"] = "@function.outer",
 				["[["] = "@class.outer",
+				["[o"] = "@loop.*",
+				["[z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
 			},
 			goto_previous_end = {
 				["[M"] = "@function.outer",
 				["[]"] = "@class.outer",
 			},
-			-- Below will go to either the start or the end, whichever is closer.
-			-- Use if you want more granular movements
-			-- Make it even more gradual by adding multiple queries and regex.
-			goto_next = {
-				["]d"] = "@conditional.outer",
-			},
-			goto_previous = {
-				["[d"] = "@conditional.outer",
-			}
 		},
 	},
 })