diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json
index 57224dc..3a60688 100644
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -1,60 +1,60 @@
 {
-  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
-  "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" },
+  "Ionide-vim": { "branch": "master", "commit": "00099c3cf53cba28a1d8084ab8d21639c62bd747" },
+  "LuaSnip": { "branch": "master", "commit": "878ace11983444d865a72e1759dbcc331d1ace4c" },
   "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" },
   "cloak.nvim": { "branch": "main", "commit": "6e5bcd50bebc5cdb7cd3a00eb3d97ab7c4cc3b94" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "codesnap.nvim": { "branch": "main", "commit": "00e2156364e97a5285bcea65536fd4a9a05839c8" },
-  "conform.nvim": { "branch": "master", "commit": "393210360b9e807862e5329763526509f52b5218" },
-  "copilot.vim": { "branch": "release", "commit": "b603990a639bb4b8651d054ef8d5a8fe5db56e0c" },
+  "codesnap.nvim": { "branch": "main", "commit": "a223fd882953e56ae1a8747fdc44b8d6a2ff7a9b" },
+  "conform.nvim": { "branch": "master", "commit": "f3b930db4964d60e255c8f9e37b7f2218dfc08cb" },
+  "copilot.vim": { "branch": "release", "commit": "25feddf8e3aa79f0573c8f43ddb13c44c530cfa5" },
+  "cord.nvim": { "branch": "master", "commit": "c366ac0e7b3a8fb2b854a21fa53e279ba5e89403" },
   "csharpls-extended-lsp.nvim": { "branch": "master", "commit": "bde4aebe0dc74952188c2130c6831a1d8e4ce5c6" },
-  "friendly-snippets": { "branch": "main", "commit": "fa36367422da5a38560892e3db6d090a635d9d41" },
-  "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
+  "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
+  "gitsigns.nvim": { "branch": "main", "commit": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e" },
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" },
-  "image.nvim": { "branch": "master", "commit": "604692f493519128c58893c28273d4247bc71a4d" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
-  "kitty-scrollback.nvim": { "branch": "main", "commit": "22f524f1fa9c7660804a1800ed0fe981c5d392c8" },
-  "lazy.nvim": { "branch": "main", "commit": "d3974346b6cef2116c8e7b08423256a834cb7cbc" },
-  "leap.nvim": { "branch": "main", "commit": "f1f19fc268b406b00b50091f51f16d9634fbe449" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "e00dcf8a6019a88139626c1668dccdc295abd324" },
+  "image.nvim": { "branch": "master", "commit": "2a618c86d9f8fd9f7895d12b55ec2f31fd14fa05" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" },
+  "kitty-scrollback.nvim": { "branch": "main", "commit": "08960ad9a96ff6ea6269157dbd4a8a499f7a4311" },
+  "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" },
+  "leap.nvim": { "branch": "main", "commit": "5d10692be460f9e8a42d34cf98a012e3e18b23bf" },
+  "lsp-zero.nvim": { "branch": "v3.x", "commit": "16de3b18c5f7b6230d89b8e64ce9a4801b6f8d08" },
   "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "05744f0f1967b5757bd05c08df4271ab8ec990aa" },
-  "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
+  "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
   "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
-  "noice.nvim": { "branch": "main", "commit": "f4decbc7a80229ccc9f86026b74bdcf0c39e38a7" },
-  "nui.nvim": { "branch": "main", "commit": "a3597dc88b53489d3fddbddbbd13787355253bb0" },
-  "nvim-autopairs": { "branch": "master", "commit": "14e97371b2aab6ee70054c1070a123dfaa3e217e" },
-  "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" },
-  "nvim-dap": { "branch": "master", "commit": "6ae8a14828b0f3bff1721a35a1dfd604b6a933bb" },
-  "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" },
+  "noice.nvim": { "branch": "main", "commit": "f119045f38792ad5311e5f9be7a879e4c1a95fe0" },
+  "nui.nvim": { "branch": "main", "commit": "b1b3dcd6ed8f355c78bad3d395ff645be5f8b6ae" },
+  "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
+  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
+  "nvim-dap": { "branch": "master", "commit": "922ebc75c2fa9305e36402fbd8c984c8638770a0" },
+  "nvim-dap-ui": { "branch": "master", "commit": "334cf3038c4756e6ab999cbac67c847fb654c190" },
   "nvim-lightbulb": { "branch": "master", "commit": "8f00b89dd1b1dbde16872bee5fbcee2e58c9b8e9" },
-  "nvim-lspconfig": { "branch": "master", "commit": "97762065bf7e1ac617d0a8710eb7ec2d656287a9" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d70633830acf605ec03d9728698d9e7232442eb4" },
   "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
-  "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
-  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
-  "nvim-treesitter": { "branch": "master", "commit": "268611e3ece8463bfb5b09044dcd1b76a28ffbb6" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "2650e6431f7daba5d9c2c64134fa5eb2312eb3d7" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
-  "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
-  "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
-  "onedarkpro.nvim": { "branch": "main", "commit": "9cb77d936fd42c2c98becceb0f132df170d4eba0" },
-  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
+  "nvim-nio": { "branch": "master", "commit": "632024157d01e8bc48fd7df6a7de8ffe3fdd4f3a" },
+  "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" },
+  "nvim-treesitter": { "branch": "master", "commit": "aa02427dfeaead86fae038024ae7b29299f08b8c" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "8ae54b90e36ef1fc5267214b30c2cbff71525fe4" },
+  "nvim-ufo": { "branch": "main", "commit": "65dda6360879f6ffe0278163b9192a573a0d2a08" },
+  "nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" },
+  "onedarkpro.nvim": { "branch": "main", "commit": "13c3244b2520a832989d797d69436df7d27e20b9" },
+  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
   "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "7ef0766b5cd2f5cdf4fcb08886f0a2ebf65981fa" },
-  "rustaceanvim": { "branch": "master", "commit": "2eb8776df1aab03f514b38ddc39af57efbd8970b" },
+  "rainbow-delimiters.nvim": { "branch": "master", "commit": "849803e0a687c6ef7c9a0d305bd4d441017b8abf" },
+  "rustaceanvim": { "branch": "master", "commit": "e306c742bd7f7183e371cd91268b72d9db1bbae0" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
-  "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
+  "trouble.nvim": { "branch": "main", "commit": "a8264a65a0b894832ea642844f5b7c30112c458f" },
   "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "vim-dadbod": { "branch": "master", "commit": "37523ffe0849b51db07fa7f48430c2aca5420a0e" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "5835df6497cc0e79cb149518d01f4f5c86dc546f" },
-  "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" },
+  "vim-dadbod": { "branch": "master", "commit": "fb30422b7bee7e2fa4205a4d226f01477f4fc593" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "0dc68d9225a70d42f8645049482e090c1a8dce25" },
+  "vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" },
   "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }
 }
\ No newline at end of file
diff --git a/nvim/lua/themystery/plugins/auto-tag.lua b/nvim/lua/themystery/plugins/auto-tag.lua
new file mode 100644
index 0000000..2ab5e47
--- /dev/null
+++ b/nvim/lua/themystery/plugins/auto-tag.lua
@@ -0,0 +1,21 @@
+return {
+    "windwp/nvim-ts-autotag",
+    config = function()
+        require('nvim-ts-autotag').setup({
+            opts = {
+                -- Defaults
+                enable_close = true,          -- Auto close tags
+                enable_rename = true,         -- Auto rename pairs of tags
+                enable_close_on_slash = false -- Auto close on trailing </
+            },
+            -- Also override individual filetype configs, these take priority.
+            -- Empty by default, useful if one of the "opts" global settings
+            -- doesn't work well in a specific filetype
+            per_filetype = {
+                ["html"] = {
+                    enable_close = false
+                }
+            }
+        })
+    end
+}
diff --git a/nvim/lua/themystery/plugins/comments.lua b/nvim/lua/themystery/plugins/comments.lua
deleted file mode 100644
index 6cfebc0..0000000
--- a/nvim/lua/themystery/plugins/comments.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-return {
-    "numToStr/Comment.nvim",
-    config = function()
-        require('Comment').setup({
-            toggler = {
-                -- if you're using other terminals use '<C-_>' but for some reason in kitty this didn't work, so i used '<C-/>'
-                line = '<C-/>',
-                block = '<C-\\>',
-            },
-            opleader = {
-                -- look at the comment above
-                line = '<C-/>',
-                block = '<C-\\>',
-            },
-        })
-    end
-}
diff --git a/nvim/lua/themystery/plugins/conform.lua b/nvim/lua/themystery/plugins/conform.lua
index 090efaa..320ee14 100644
--- a/nvim/lua/themystery/plugins/conform.lua
+++ b/nvim/lua/themystery/plugins/conform.lua
@@ -23,7 +23,7 @@ return {
             rust = {"rustfmt"}
         },
         -- -- Set up format-on-save
-        -- format_on_save = { timeout_ms = 500, lsp_fallback = true },
+        format_on_save = { timeout_ms = 500, lsp_fallback = true },
         -- Customize formatters
         formatters = {
             shfmt = {
diff --git a/nvim/lua/themystery/plugins/copilot.lua b/nvim/lua/themystery/plugins/copilot.lua
index d7ce77e..a1cc3dd 100644
--- a/nvim/lua/themystery/plugins/copilot.lua
+++ b/nvim/lua/themystery/plugins/copilot.lua
@@ -1,7 +1,7 @@
 return {
     "github/copilot.vim",
     config = function()
-        vim.g.copilot_no_tab_map = true
+        -- vim.g.copilot_no_tab_map = true
         vim.api.nvim_set_keymap("i", "<C-J>", 'copilot#Accept("<CR>")', { silent = true, expr = true })
         vim.g.copilot_filetypes = {
             -- because i'm learning rust
diff --git a/nvim/lua/themystery/plugins/cord.lua b/nvim/lua/themystery/plugins/cord.lua
new file mode 100644
index 0000000..63b2dc4
--- /dev/null
+++ b/nvim/lua/themystery/plugins/cord.lua
@@ -0,0 +1,23 @@
+return {
+    'vyfor/cord.nvim',
+    build = './build',
+    event = 'VeryLazy',
+    config = function()
+        require('cord').setup({
+            timer = {
+                enable = true,                              -- Enable automatically updating presence
+                interval = 1500,                            -- Interval between presence updates in milliseconds (min 500)
+                reset_on_idle = true,                      -- Reset start timestamp on idle
+                reset_on_change = false,                    -- Reset start timestamp on presence change
+            },
+            text = {
+                viewing = 'Viewing {}',                     -- Text to display when viewing a readonly file
+                editing = 'Editing {}',                     -- Text to display when editing a file
+                file_browser = 'Browsing files in {}',      -- Text to display when browsing files (Empty string to disable)
+                plugin_manager = 'Managing plugins in {}',  -- Text to display when managing plugins (Empty string to disable)
+                lsp_manager = 'Configuring LSP in {}',      -- Text to display when managing LSP servers (Empty string to disable)
+                workspace = '',
+            }
+        })
+    end
+}
diff --git a/nvim/lua/themystery/plugins/init.lua b/nvim/lua/themystery/plugins/init.lua
index 341e839..92984a3 100644
--- a/nvim/lua/themystery/plugins/init.lua
+++ b/nvim/lua/themystery/plugins/init.lua
@@ -44,7 +44,6 @@ return {
     {
         "ionide/Ionide-vim",
         event = "VimEnter",
-        enabled = false
     },
     {
         'ggandor/leap.nvim',
@@ -59,5 +58,9 @@ return {
         "lukas-reineke/headlines.nvim",
         dependencies = "nvim-treesitter/nvim-treesitter",
         config = true, -- or `opts = {}`
+    },
+    {
+        "L3MON4D3/LuaSnip",
+        build = "make install_jsregexp"
     }
 }
diff --git a/nvim/lua/themystery/plugins/sql.lua b/nvim/lua/themystery/plugins/sql.lua
index 3b3f153..fee32b1 100644
--- a/nvim/lua/themystery/plugins/sql.lua
+++ b/nvim/lua/themystery/plugins/sql.lua
@@ -3,7 +3,7 @@ return {
     {
         'kristijanhusak/vim-dadbod-completion',
         ft = sql_ft,
-        dependencies = { 'kristijanhusak/vim-dadbod', lazy = true},
+        dependencies = { 'tpope/vim-dadbod', lazy = true },
         lazy = true,
         init = function()
             -- vim.api.nvim_create_autocmd("FileType", {
@@ -44,8 +44,8 @@ return {
         'kristijanhusak/vim-dadbod-ui',
         dependencies =
         {
-            { 'tpope/vim-dadbod', lazy = true },
-            {'kristijanhusak/vim-dadbod-completion'},
+            { 'tpope/vim-dadbod',                    lazy = true },
+            { 'kristijanhusak/vim-dadbod-completion' },
         },
         cmd = {
             'DBUI',
diff --git a/nvim/lua/themystery/plugins/treesitter.lua b/nvim/lua/themystery/plugins/treesitter.lua
index ca68380..890ac1b 100644
--- a/nvim/lua/themystery/plugins/treesitter.lua
+++ b/nvim/lua/themystery/plugins/treesitter.lua
@@ -27,9 +27,6 @@ return {
                     -- Using this option may slow down your editor, and you may see some duplicate highlights.
                     -- Instead of true it can also be a list of languages
                     additional_vim_regex_highlighting = false,
-                },
-                autotag = {
-                    enable = true,
                 }
             }
             require('rainbow-delimiters.setup').setup()
@@ -40,6 +37,6 @@ return {
             }
         end
     },
-    "nvim-treesitter/nvim-treesitter-context"
+    -- "nvim-treesitter/nvim-treesitter-context"
 
 }
diff --git a/nvim/lua/themystery/remap.lua b/nvim/lua/themystery/remap.lua
index 68232bb..12ac4bc 100644
--- a/nvim/lua/themystery/remap.lua
+++ b/nvim/lua/themystery/remap.lua
@@ -1,4 +1,3 @@
-
 vim.g.mapleader = " "
 -- vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)
 
@@ -23,15 +22,15 @@ vim.keymap.set("n", "N", "Nzzzv")
 vim.keymap.set("x", "<leader>p", [["_dP]])
 
 -- next greatest remap ever : asbjornHaland
-vim.keymap.set({"n", "v"}, "<leader>y", [["+y]])
+vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
 vim.keymap.set("n", "<leader>Y", [["+Y]])
 
-vim.keymap.set({"n", "v"}, "<leader>d", [["_d]])
+vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
 
 -- This is going to get me cancelled
 vim.keymap.set("i", "<C-c>", "<Esc>")
 
-vim.keymap.set({"n", "v", "i"}, "<C-z>", "<nop>")
+vim.keymap.set({ "n", "v", "i" }, "<C-z>", "<nop>")
 vim.keymap.set("n", "Q", "<nop>")
 -- vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
 
@@ -50,8 +49,15 @@ vim.keymap.set("n", "<leader>bd", "<cmd>bd<CR>")
 --delete all buffers except current
 vim.keymap.set("n", "<leader>bda", "<cmd>:%bd|e#<CR>")
 
+-- macro recording remaps
+vim.keymap.set("n", "<leader>q", "qq")
+vim.keymap.set("n", "<leader><leader>", "@q")
+
+-- comments remaps
+vim.keymap.set("v", "<C-/>", "gc", { remap = true });
+vim.keymap.set("n", "<C-/>", "gcc", { remap = true });
+
 
 -- vim.keymap.set("n", "<leader><leader>", function()
 --     vim.cmd("so")
 -- end)
-