diff --git a/lua/keymaps.lua b/lua/keymaps.lua
index 517198b..1ab1f82 100644
--- a/lua/keymaps.lua
+++ b/lua/keymaps.lua
@@ -114,6 +114,20 @@ require("util").keymaps({
   { "<C-u>", "<C-u>zz", desc = "Vertical half page up and center cursor" },
   { "J", "mzJ`z", desc = "Move line below onto this line" },
   { "<S-Tab>", "<C-o>", desc = "Go back <C-o>" },
+  {
+    "]d",
+    function()
+      vim.diagnostic.goto_next()
+    end,
+    desc = "Go to next diagnostic",
+  },
+  {
+    "[d",
+    function()
+      vim.diagnostic.goto_prev()
+    end,
+    desc = "Go to next diagnostic",
+  },
 
   -- =============
   -- VISUAL
diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua
index 3bc08cc..c59bdf7 100644
--- a/lua/plugins/lualine.lua
+++ b/lua/plugins/lualine.lua
@@ -1,7 +1,12 @@
 local function lsp_clients()
   local clients = {}
   for _, client in pairs(vim.lsp.buf_get_clients(0)) do
-    clients[#clients + 1] = client.name
+    local name = client.name
+    -- TODO revisit this doesn't work
+    if not client.initialized then
+      name = name .. " (loading)"
+    end
+    clients[#clients + 1] = name
   end
 
   table.sort(clients)