diff --git a/init.lua b/init.lua
index fdeb1038..080ea1a2 100644
--- a/init.lua
+++ b/init.lua
@@ -44,7 +44,9 @@ What is Kickstart?
 Kickstart Guide:
 
   TODO: The very first thing you should do is to run the command `:Tutor` in Neovim.
-
+  TODO: Consider wezterm instead of tmux: https://www.florianbellmann.com/blog/switch-from-tmux-to-wezterm#wezterm-meets-neovim
+  TODO: Understand LuaSnip better and add snippets for todo-comments: https://github.com/L3MON4D3/LuaSnip/wiki/Cool-Snippets#all---todo-commentsnvim-snippets
+  TODO: More on nvim with Quarto: https://petejon.es/posts/2025-01-29-using-neovim-for-r/
     If you don't know what this means, type the following:
       - <escape key>
       - :
@@ -107,4 +109,3 @@ require 'lazy-plugins'
 
 -- The line beneath this is called `modeline`. See `:help modeline`
 -- vim: ts=2 sts=2 sw=2 et
-
diff --git a/lazy-lock.json b/lazy-lock.json
index 0546094c..4eb846de 100644
--- a/lazy-lock.json
+++ b/lazy-lock.json
@@ -6,6 +6,7 @@
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "conform.nvim": { "branch": "master", "commit": "eebc724d12c5579d733d1f801386e0ceb909d001" },
   "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
+  "friendly-snippets": { "branch": "main", "commit": "31f2a2657b6261724313281fe0d8ba6f43f4a4fa" },
   "gitsigns.nvim": { "branch": "main", "commit": "fcfa7a989cd6fed10abf02d9880dc76d7a38167d" },
   "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
   "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
diff --git a/lua/custom/plugins/init.lua b/lua/custom/plugins/init.lua
index be0eb9d8..161535c3 100644
--- a/lua/custom/plugins/init.lua
+++ b/lua/custom/plugins/init.lua
@@ -1,3 +1,4 @@
+-- TODO: check out mini.nvim: https://github.com/echasnovski/mini.nvim and related blog post: https://evantravers.com/articles/2024/09/17/making-my-nvim-act-more-like-helix-with-mini-nvim/
 -- You can add your own plugins here or in other files in this directory!
 --  I promise not to create any merge conflicts in this directory :)
 --
diff --git a/lua/kickstart/plugins/cmp.lua b/lua/kickstart/plugins/cmp.lua
index fb5e4cf2..33fe6b14 100644
--- a/lua/kickstart/plugins/cmp.lua
+++ b/lua/kickstart/plugins/cmp.lua
@@ -19,12 +19,12 @@ return {
           -- `friendly-snippets` contains a variety of premade snippets.
           --    See the README about individual language/framework/plugin snippets:
           --    https://github.com/rafamadriz/friendly-snippets
-          -- {
-          --   'rafamadriz/friendly-snippets',
-          --   config = function()
-          --     require('luasnip.loaders.from_vscode').lazy_load()
-          --   end,
-          -- },
+          {
+            'rafamadriz/friendly-snippets',
+            config = function()
+              require('luasnip.loaders.from_vscode').lazy_load()
+            end,
+          },
         },
       },
       'saadparwaiz1/cmp_luasnip',
@@ -71,9 +71,9 @@ return {
 
           -- If you prefer more traditional completion keymaps,
           -- you can uncomment the following lines
-          ['<CR>'] = cmp.mapping.confirm { select = true },
-          --['<Tab>'] = cmp.mapping.select_next_item(),
-          --['<S-Tab>'] = cmp.mapping.select_prev_item(),
+          ['<Tab>'] = cmp.mapping.confirm { select = true },
+          ['<Up>'] = cmp.mapping.select_next_item(),
+          ['<Down>'] = cmp.mapping.select_prev_item(),
 
           -- Manually trigger a completion from nvim-cmp.
           --  Generally you don't need this, because nvim-cmp will display
diff --git a/lua/kickstart/plugins/which-key.lua b/lua/kickstart/plugins/which-key.lua
index 52951172..289afb68 100644
--- a/lua/kickstart/plugins/which-key.lua
+++ b/lua/kickstart/plugins/which-key.lua
@@ -68,7 +68,7 @@ return {
         { '<leader>t', group = '[T]oggle' },
         { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
         { '<leader>z', ':ZenMode<cr>', desc = '[Z]en mode' },
-        -- Toggle
+        -- Search
         { '<leader>st', ':TodoTelescope<cr>', desc = '[T]odo' },
         -- Search and Replace
         { '<leader>r', group = '[R]eplace' },
@@ -77,16 +77,17 @@ return {
         -- Quarto
         { '<leader>q', group = '[q]uarto' },
         { '<leader>qh', ':QuartoHelp ', desc = '[h]elp' },
-        { '<leader>qp', ":lua require'quarto'.quartoPreview({ args = '--port 4242 --no-browser' })<cr>", desc = '[p]review' },
+        { '<leader>qf', ":lua require'quarto'.quartoPreview({ args = '--port 4242 --no-browser' })<cr>", desc = '[f]ixed port preview' },
+        { '<leader>qq', ':QuartoClosePreview<cr>', desc = '[q]uit preview' },
+        { '<leader>qp', ':QuartoPreview<cr>', desc = '[p]review' },
         -- Vim
         { '<leader>v', group = '[v]im' },
         { '<leader>vc', ':Telescope colorscheme<cr>', desc = '[c]olortheme' },
         { '<leader>vt', toggle_light_dark_theme, desc = '[t]oggle light/dark theme' },
-        -- Package/LS managers
-        { '<leader>l', ':Lazy<cr>', desc = '[L]azy' },
-        { '<leader>m', group = '[M]ason' },
-        { '<leader>mo', ':Mason<cr>', desc = '[O]pen' },
-        { '<leader>mi', ':MasonInstall ', desc = '[I]nstall' },
+        { '<leader>vl', ':Lazy<cr>', desc = '[L]azy' },
+        { '<leader>vm', group = '[M]ason' },
+        { '<leader>vmo', ':Mason<cr>', desc = '[O]pen' },
+        { '<leader>vmi', ':MasonInstall ', desc = '[I]nstall' },
         -- Insert comments
         { '<leader>i', group = '[I]nsert' },
       },