diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json
index eb8b52d..e7d2dc8 100644
--- a/config/.config/nvim/lazy-lock.json
+++ b/config/.config/nvim/lazy-lock.json
@@ -1,3 +1,3 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "cea5920abb202753004440f94ec39bcf2927e02e" }
+  "lazy.nvim": { "branch": "main", "commit": "5473e3d77c13e40fc4758fa977a1f2c14d0b4ceb" }
 }
\ No newline at end of file
diff --git a/vim/.vim/lua/plugins/cmp.lua b/vim/.vim/lua/plugins/cmp.lua
index ce47d41..7d6a051 100644
--- a/vim/.vim/lua/plugins/cmp.lua
+++ b/vim/.vim/lua/plugins/cmp.lua
@@ -49,7 +49,6 @@ return {
 
 			if use_google() then
 				table.insert(conditionalSources, { name = "nvim_ciderlsp", priority = 8 })
-				table.insert(conditionalSources, { name = "analysislsp" })
 				table.insert(conditionalSources, { name = "buganizer", option = { notifications_enabled = true } })
 			else
 				table.insert(conditionalSources, { name = "codeium", priority = 8 })
@@ -155,7 +154,6 @@ return {
 							buganizer = " Buganizer",
 							nerdfont = "󰊪 nerdfont",
 							nvim_ciderlsp = "󰚩 Cider",
-							analysislsp = "󰟌 analysislsp",
 							nvim_lsp_signature_help = "󰊕",
 							nvim_lsp = " LSP",
 							nvim_lua = " lua",
diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua
index d492be0..d6b78f9 100644
--- a/vim/.vim/lua/plugins/google.lua
+++ b/vim/.vim/lua/plugins/google.lua
@@ -310,14 +310,16 @@ return {
 			{ "<Leader>uc", ":CritiqueToggleUnresolvedComments<CR>" },
 			{ "<Leader>ac", ":CritiqueToggleAllComments<CR>" },
 			{ "<Leader>fc", ":CritiqueFetchComments<CR>" },
-			{ "<Leader>tc", ":CritiqueCommentsTelescope<CR>" },
+			-- { "<Leader>tc", ":CritiqueCommentsTelescope<CR>" },
+			-- { "<Leader>tc", ":CritiqueCommentsTelescope<CR>" },
 		},
 		config = function()
 			-- Here are all the options and their default values:
 			require("critique.comments").setup({
-				debug = 0, -- default = 0
+				debug = 1, -- default = 0
 				-- Fetch the comments after calling `setup`.
 				auto_fetch = true, -- default = true
+				auto_render = true, -- default = true
 				-- Allow checking for comments on BufEnter events. This is throttled to once every 10 seconds.
 				frequent_fetch = true, -- default = false
 				verbose_notifications = true,
diff --git a/vim/.vim/lua/plugins/lsp.lua b/vim/.vim/lua/plugins/lsp.lua
index 46d367e..708bddc 100644
--- a/vim/.vim/lua/plugins/lsp.lua
+++ b/vim/.vim/lua/plugins/lsp.lua
@@ -63,12 +63,18 @@ return {
 			"neovim/nvim-lspconfig",
 			"nvim-treesitter/nvim-treesitter",
 		},
-		cond = not use_google(),
+		-- cond = not use_google(),
 		config = function()
 			local capabilities =
 				require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
 			capabilities.offsetEncoding = { "utf-16" }
-			require("go").setup({ lsp_cfg = { capabilities = capabilities } })
+			require("go").setup({
+				lsp_cfg = { capabilities = capabilities },
+				lsp_keymaps = false,
+				lsp_inlay_hints = {
+					enable = not use_google(), -- doesn't work with ciderlsp
+				},
+			})
 			-- Run gofmt + goimports on save
 
 			local format_sync_grp = vim.api.nvim_create_augroup("goimports", {})
diff --git a/vim/.vim/lua/plugins/telescope.lua b/vim/.vim/lua/plugins/telescope.lua
index a991a30..6c8f167 100644
--- a/vim/.vim/lua/plugins/telescope.lua
+++ b/vim/.vim/lua/plugins/telescope.lua
@@ -24,7 +24,6 @@ end
 _G.live_grep = function(search_dirs)
 	require("telescope.builtin").live_grep({
 		search_dirs = search_dirs,
-		-- search_dirs = ,
 	})
 end
 
@@ -51,10 +50,11 @@ end
 local keys = {
 	{ "<leader>e", ":lua search_cwd()<CR>", desc = "Find Files in Buffer Directory" },
 	{ "<leader>ts.", ":lua live_grep({vim.fn.getcwd()})<CR>", desc = "Search in CWD" },
+	{ "<leader>ts", ':lua live_grep({vim.fn.expand("%%")})<CR>', desc = "Search in Buffer Directory" },
 	{ "<leader>t.", ":lua find_dotfiles()<CR>", desc = "Find Dotfiles" },
-	{ "<leader>ts", ':lua live_grep({vim.fn.expand("%%")})<CR>', desc = "Find Files in Buffer Directory" },
 	{ "<leader>tc", ":Telescope textcase<CR>", desc = "Text case" },
-	{ "<leader>tC", ":CritiqueCommentsTelescope<CR>", desc = "Critique comments" },
+	{ "<leader>tC", ":CritiqueUnresolvedCommentsTelescope<CR>", desc = "Critique unresolved comments" },
+	{ "<leader>tca", ":CritiqueCommentsTelescope<CR>", desc = "Critique all comments" },
 	{ "<leader>tg", ":Telescope git_files<CR>", desc = "Git Files" },
 	{ "<leader>th", ":lua require('telescope.builtin').help_tags{}<CR>", desc = "[T]elescope [H]elp" },
 	{ "<leader>tk", ":Telescope keymaps<CR>", desc = "Keymaps" },
@@ -160,7 +160,13 @@ return {
 						return path
 					end,
 					mappings = {
+						n = {
+							["<C-c>"] = require("telescope.actions").close,
+							["<Esc>"] = require("telescope.actions").close,
+						},
 						i = {
+							["<C-c>"] = require("telescope.actions").close,
+							["<Esc>"] = require("telescope.actions").close,
 							["<S-Down>"] = function()
 								require("telescope.actions").cycle_history_next()
 							end,