diff --git a/init.lua b/init.lua
index 74870e16..40486661 100644
--- a/init.lua
+++ b/init.lua
@@ -234,6 +234,9 @@ vim.o.termguicolors = true
 vim.o.relativenumber = true
 vim.o.number = true
 
+vim.o.scrolloff = 5
+vim.o.sidescrolloff = 10
+
 -- [[ Basic Keymaps ]]
 
 -- Keymaps for better default experience
@@ -273,7 +276,7 @@ pcall(require('telescope').load_extension, 'fzf')
 
 -- See `:help telescope.builtin`
 vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
-vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
+vim.keymap.set('n', '<leader>b', require('telescope.builtin').buffers, { desc = 'Find existing [b]uffers' })
 vim.keymap.set('n', '<leader>/', function()
   -- You can pass additional configuration to telescope to change theme, layout, etc.
   require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
@@ -413,7 +416,8 @@ end
 local servers = {
   clangd = {},
   gopls = {},
-  solargraph = {},
+  -- solargraph = {},
+  ruby_ls = {},
   sqlls = {},
   angularls = {},
   bashls = {},
diff --git a/lua/custom/plugins/easymotion.lua b/lua/custom/plugins/easymotion.lua
new file mode 100644
index 00000000..82639d4f
--- /dev/null
+++ b/lua/custom/plugins/easymotion.lua
@@ -0,0 +1,3 @@
+return {
+  'easymotion/vim-easymotion'
+}
diff --git a/lua/custom/plugins/filtree.lua b/lua/custom/plugins/filtree.lua
index 87d84b9e..f29e7bc0 100644
--- a/lua/custom/plugins/filtree.lua
+++ b/lua/custom/plugins/filtree.lua
@@ -13,5 +13,8 @@ return {
     require('neo-tree').setup {
       close_if_last_window = true,
     }
+
+    vim.keymap.set('n', '<leader>nf', ':NeoTreeFloatToggle<CR>', { desc = '[N]eoTree [F]loat Toggle' })
+    vim.keymap.set('n', '<leader>nr', ':NeoTreeRevealToggle<CR>', { desc = '[N]eoTree [R]eveal Toggle' })
   end,
 }
diff --git a/lua/custom/plugins/surround.lua b/lua/custom/plugins/surround.lua
new file mode 100644
index 00000000..f1ba9a6b
--- /dev/null
+++ b/lua/custom/plugins/surround.lua
@@ -0,0 +1,7 @@
+return {
+  "kylechui/nvim-surround",
+  version = "*",
+  config = function ()
+    require("nvim-surround").setup()
+  end
+}