diff --git a/google/.blazerc b/google/.blazerc
index 3f96c24..6d1497a 100644
--- a/google/.blazerc
+++ b/google/.blazerc
@@ -26,14 +26,13 @@
 # --order_output=no: By default, blaze query orders the outputs. This can be expensive,
 #     so this flag disables the ordering step.
 build --nostamp
-# build --workspace_status_command=/bin/true
-# build --experimental_spawn_scheduler
+build --workspace_status_command=/bin/true
 build --trim_test_configuration
 build --show_progress_rate_limit=1
-# query --order_output=no
 
 # --test_output / --test_summary obviously don’t do anything for performance,
 # keep them if you like what they do.
+test --test_output=all --test_summary=detailed --build_tests_only
 # test --test_output=errors --test_summary=detailed --build_tests_only
 
 # In C++, failing tests will print a lot of noisy thread output. Use
@@ -43,9 +42,8 @@ build --show_progress_rate_limit=1
 # test --test_arg=--undefok=suppress_failure_output --test_arg=--suppress_failure_output
 
 import %workspace%/java/com/google/android/gmscore/blaze/blazerc
-build --config=gmscore_tap
-test --config=gmscore_test
-test --test_output=all
+# build --config=gmscore_arm64
+# test --config=gmscore_test
 #
 # https://g3doc.corp.google.com/devtools/blaze/g3doc/faq.md?cl=head#BlazeOom
 startup --host_jvm_args=-Xmx18G --host_jvm_args=-Xms18G
diff --git a/vim/.vim/lua/plugins/google.lua b/vim/.vim/lua/plugins/google.lua
index c7e4290..4037c3c 100644
--- a/vim/.vim/lua/plugins/google.lua
+++ b/vim/.vim/lua/plugins/google.lua
@@ -56,8 +56,9 @@ return {
 	veryLazy(glug("ft-javascript", { event = "BufRead,BufNewFile *.js,*.jsx" })),
 	veryLazy(glug("ft-kotlin", { event = "BufRead,BufNewFile *.kt,*.kts" })),
 	veryLazy(glug("ft-python", { event = "BufRead,BufNewFile *.py" })),
+
 	-- Configures nvim to respect Google's coding style
-	veryLazy(glug("googlestyle", { event = { "BufRead", "BufNewFile" } })),
+	-- glug("googlestyle", { event = { "BufRead", "BufNewFile" } }),
 
 	veryLazy(glug("add_usings")),
 	-- Autogens boilerplate when creating new files
@@ -94,18 +95,10 @@ return {
 	}),
 	glug("relatedfiles", {
 		keys = {
-			{
-				"<leader>rb",
-				":exec relatedfiles#selector#JumpToBuild()<CR>",
-			},
-			{
-				"<leader>rt",
-				":exec relatedfiles#selector#JumpToTestFile()<CR>",
-			},
-			{
-				"<leader>rc",
-				":exec relatedfiles#selector#JumpToCodeFile()<CR>",
-			},
+			{ "<leader>rb", ":exec relatedfiles#selector#JumpToBuild()<CR>" },
+			{ "<leader>rt", ":exec relatedfiles#selector#JumpToTestFile()<CR>" },
+			{ "<leader>rh", ":exec relatedfiles#selector#JumpToHeader()<CR>" },
+			{ "<leader>rc", ":exec relatedfiles#selector#JumpToCodeFile()<CR>" },
 		},
 	}),
 	{ "junegunn/fzf", dir = "~/.fzf", build = "./install --all" },
@@ -181,19 +174,6 @@ return {
 		end,
 	}),
 
-	glug("critique", {
-		dependencies = {
-			veryLazy(glug("googler")),
-		},
-		-- optional = true,
-		cmd = {
-			"CritiqueComments",
-			"CritiqueUnresolvedComments",
-			"CritiqueNextComment",
-			"CritiquePreviousComment",
-		},
-	}),
-
 	-- Run blaze commands
 	glug("blaze", {
 		dependencies = {
@@ -315,6 +295,16 @@ return {
 			"nvim-telescope/telescope.nvim",
 			"runiq/neovim-throttle-debounce",
 		},
+		-- here are some mappings you might want:
+		keys = {
+			{ "]c", ":CritiqueGotoNextComment<CR>" },
+			{ "[c", ":CritiqueGotoPrevComment<CR>" },
+			{ "<Leader>lc", ":CritiqueToggleLineComment<CR>" },
+			{ "<Leader>uc", ":CritiqueToggleUnresolvedComments<CR>" },
+			{ "<Leader>ac", ":CritiqueToggleAllComments<CR>" },
+			{ "<Leader>fc", ":CritiqueFetchComments<CR>" },
+			{ "<Leader>tc", ":CritiqueCommentsTelescope<CR>" },
+		},
 		config = function()
 			-- Here are all the options and their default values:
 			require("critique.comments").setup({
@@ -325,15 +315,6 @@ return {
 				frequent_fetch = true, -- default = false
 				verbose_notifications = true,
 			})
-			local map = require("utils").map
-			-- here are some mappings you might want:
-			map("n", "]c", [[<Cmd>CritiqueGotoNextComment<CR>]])
-			map("n", "[c", [[<Cmd>CritiqueGotoPrevComment<CR>]])
-			map("n", "<Leader>lc", [[<Cmd>CritiqueToggleLineComment<CR>]])
-			map("n", "<Leader>uc", [[<Cmd>CritiqueToggleUnresolvedComments<CR>]])
-			map("n", "<Leader>ac", [[<Cmd>CritiqueToggleAllComments<CR>]])
-			map("n", "<Leader>fc", [[<Cmd>CritiqueFetchComments<CR>]])
-			map("n", "<Leader>tc", [[<Cmd>CritiqueCommentsTelescope<CR>]])
 		end,
 	},
 	{