diff --git a/nvim/lua/plugins/which-key.lua b/nvim/lua/plugins/which-key.lua
index d7770554..d0a89eb2 100644
--- a/nvim/lua/plugins/which-key.lua
+++ b/nvim/lua/plugins/which-key.lua
@@ -10,30 +10,38 @@ wk.register({
   ['<left>'] = { '<cmd>bprevious<cr>', 'buffer navigation with arrow keys' },
 
   g = {
-    b = { '<cmd>Gitsigns blame_line<cr>', '' },
-    f = { '<cmd>execute "/\\v^[<\\|=>]{7}/"<cr>', '' },
+    a = { '<cmd>lua vim.lsp.buf.code_action()<cr>', 'run code action' },
+    b = { '<cmd>Gitsigns blame_line<cr>', 'git blame line' },
     d = { '<cmd>lua vim.lsp.buf.definition()<cr>', 'show/go to definition' },
-    i = { '<cmd>lua vim.lsp.buf.implementation()<cr>', 'show/go to implementation' },
-    r = { '<cmd>lua vim.lsp.buf.references()<cr>', 'show/go to referennces' },
+    e = { '<cmd>lua vim.diagnostic.goto_next()<cr>', 'go to next error in file' },
+    f = { '<cmd>lua vim.lsp.buf.formatting()<cr>', 'format file with LSP' },
+    h = { '<cmd>lua vim.lsp.buf.hover()<cr>', 'show hover info' },
+    r = { '<cmd>lua vim.lsp.buf.rename()<cr>', 'lsp rename' },
+    x = { '<cmd>execute "/\\v^[<\\|=>]{7}/"<cr>', 'find git conflicts in file' },
+
+    D = { '<cmd>lua vim.lsp.buf.declaration()<cr>', 'show/go to declaration' },
+    I = { '<cmd>lua vim.lsp.buf.implementation()<cr>', 'show/go to implementation' },
+    R = { '<cmd>lua vim.lsp.buf.references()<cr>', 'show/go to referennces' },
   },
 
-  K = { '', 'K man-pages mapping removed' },
   j = { 'gj', 'j and k with wrapped lines' },
   k = { 'gk', 'j and k with wrapped lines' },
   n = { 'nzzzv', 'kepping it centered with n' },
-  v = { '<C-V>', 'remapping visual/visual-block mode' },
   s = { function() require('flash').jump() end, 'flash jump' },
+  v = { '<C-V>', 'remapping visual/visual-block mode' },
+
+  K = { '', 'K man-pages mapping removed' },
   N = { 'Nzzzv', 'kepping it centered with N' },
   Q = { '', 'Q ex-mode-mapping removed' },
   S = { function() require('flash').treesitter() end, 'flash treesitter select' },
-  Y = { 'y$', 'yank till end of line with Y'},
+  Y = { 'y$', 'yank till end of line with Y' },
 
   -- with <CTRL> as modifier
-  ['<C-h>'] = { '<cmd>NavigatorLeft<cr>', '' },
-  ['<C-j>'] = { '<cmd>NavigatorDown<cr>', '' },
-  ['<C-k>'] = { '<cmd>NavigatorUp<cr>', '' },
-  ['<C-l>'] = { '<cmd>NavigatorRight<cr>', '' },
-  ['<C-V>'] = { 'v', '' },
+  ['<C-h>'] = { '<cmd>NavigatorLeft<cr>', 'move to the lefthand split' },
+  ['<C-j>'] = { '<cmd>NavigatorDown<cr>', 'move to the rigthand split' },
+  ['<C-k>'] = { '<cmd>NavigatorUp<cr>', 'move to the upper split' },
+  ['<C-l>'] = { '<cmd>NavigatorRight<cr>', 'move to the lower split' },
+  ['<C-V>'] = { 'v', 'remapping visual/visual-block mode' },
 
   -- with <ALT/META> as modifier
   ['<M-k>'] = { ':move .-2<cr>', 'bubbling lines with alt-hjkl', noremap = false },
@@ -46,29 +54,23 @@ wk.register({
 wk.register({
   ['\\'] = { '<C-w>v<C-w>l', 'Vertical split' },
   ['-'] = { '<C-w>s<C-w>j', 'Horizontal split' },
-  [','] = { '<cmd>Telescope find_files<cr>', 'Telescope find files' },
-  ['.'] = { '<cmd>Telescope buffers<cr>', 'Telescope find buffers' },
-  ['\''] = { '<cmd>Telescope git_files<cr>', 'Telescope in git files' },
-  ['/'] = { '<cmd>Telescope search_history<cr>', 'Telescope find in search history' },
-  [';'] = { '<cmd>Telescope command_history<cr>', 'Telescope find in command history' },
-  [']'] = { '<cmd>Telescope current_buffer_fuzzy_find<cr>', 'Telescope in current buffer' },
+  [','] = { '<cmd>Telescope find_files<cr>', 'find files' },
+  ['.'] = { '<cmd>Telescope buffers<cr>', 'find buffers' },
+  ['\''] = { '<cmd>Telescope git_files<cr>', 'find in git files' },
+  [';'] = { '<cmd>Telescope command_history<cr>', 'find in command history' },
+  ['/'] = { '<cmd>Telescope search_history<cr>', 'find in search history' },
+  [']'] = { '<cmd>Telescope current_buffer_fuzzy_find<cr>', 'find line in current buffer' },
 
-  a = { '<cmd>Telescope live_grep<cr>', '' },
-  b = { '<cmd>Telescope git_branches<cr>', '' },
-  c = { '<cmd>Telescope git_bcommits<cr>', '' },
-  d = { '<cmd>lua vim.lsp.buf.declaration()<cr>', '' },
-  e = { '<cmd>lua vim.diagnostic.goto_next()<cr>', '' },
-  f = { '<cmd>lua vim.lsp.buf.formatting()<cr>', '' },
-  h = { '<cmd>lua vim.lsp.buf.hover()<cr>', '' },
-  r = { '<cmd>lua vim.lsp.buf.rename()<cr>', '' },
-  x = { '<cmd>lua vim.lsp.buf.code_action()<cr>', '' },
-  l = { '<cmd>FloatermNew lazygit<cr>', '' },
-  t = { '<cmd>FloatermNew<cr>', '' },
+  a = { '<cmd>Telescope live_grep<cr>', 'live ripgrep' },
+  b = { '<cmd>Telescope git_branches<cr>', 'git branches' },
+  c = { '<cmd>Telescope git_bcommits<cr>', 'commits for buffer' },
+  l = { '<cmd>FloatermNew lazygit<cr>', 'open lazygit' },
+  t = { '<cmd>FloatermNew<cr>', 'open new terminal' },
   v = {
-    ve = { '<cmd>e $MYVIMRC<cr>', '' },
-    vr = { '<cmd>source $MYVIMRC<cr>', '' },
+    e = { '<cmd>e $MYVIMRC<cr>', 'edit vimrc' },
+    r = { '<cmd>source $MYVIMRC<cr>', 'source vimrc' },
   },
-  w = { '<cmd>set wrap! wrap?<cr>', '' },
+  w = { '<cmd>set wrap! wrap?<cr>', 'toggle line-wrapping' },
 }, { prefix = '<leader>' })
 
 -- visual-mode mappings