diff --git a/dot_nethackrc b/dot_nethackrc
index f352d95..79817f0 100644
--- a/dot_nethackrc
+++ b/dot_nethackrc
@@ -1,7 +1,8 @@
 #
 # System-wide NetHack configuration file for console-only NetHack.
 #
-OPTIONS=windowtype:tty,toptenwin,hilite_pet,!number_pad,!cmdassist
+#OPTIONS=windowtype:tty,toptenwin,hilite_pet,!number_pad,!cmdassist
+OPTIONS=!number_pad,!cmdassist
 OPTIONS=fixinv,safe_pet,sortpack,tombstone,color
 OPTIONS=verbose,news,fruit:potato
 OPTIONS=dogname:Darty
diff --git a/dot_vim/nvim.lua b/dot_vim/nvim.lua
index 272c22d..0458d88 100644
--- a/dot_vim/nvim.lua
+++ b/dot_vim/nvim.lua
@@ -385,30 +385,30 @@ require('lspkind').init({
 require('trouble').setup {
   mode = "document_diagnostics",
   auto_close = true,
-  action_keys = { -- key mappings for actions in the trouble list
+  action_keys = {   -- key mappings for actions in the trouble list
     -- map to {} to remove a mapping, for example:
     -- close = {},
     --close = "q", -- close the list
     --cancel = "<esc>", -- cancel the preview and get back to your last window / buffer / cursor
     --refresh = "r", -- manually refresh
-    jump = { "o", "<tab>" }, -- jump to the diagnostic or open / close folds
+    jump = { "o", "<tab>" },     -- jump to the diagnostic or open / close folds
     --open_split = { "<c-x>" }, -- open buffer in new split
     --open_vsplit = { "<c-v>" }, -- open buffer in new vsplit
-    open_tab = {},                -- open buffer in new tab
-    jump_close = { "<cr>" },      -- jump to the diagnostic and close the list
-    toggle_mode = "m",            -- toggle between "workspace" and "document" diagnostics mode
-    toggle_preview = "P",         -- toggle auto_preview
-    hover = "K",                  -- opens a small popup with the full multiline message
-    preview = "p",                -- preview the diagnostic location
-    close_folds = { "zM", "zm" }, -- close all folds
-    open_folds = { "zR", "zr" },  -- open all folds
-    toggle_fold = { "zA", "za" }, -- toggle fold of current file
-    previous = "k",               -- previous item
-    next = "j"                    -- next item
+    open_tab = {},                    -- open buffer in new tab
+    jump_close = { "<cr>" },          -- jump to the diagnostic and close the list
+    toggle_mode = "m",                -- toggle between "workspace" and "document" diagnostics mode
+    toggle_preview = "P",             -- toggle auto_preview
+    hover = "K",                      -- opens a small popup with the full multiline message
+    preview = "p",                    -- preview the diagnostic location
+    close_folds = { "zM", "zm" },     -- close all folds
+    open_folds = { "zR", "zr" },      -- open all folds
+    toggle_fold = { "zA", "za" },     -- toggle fold of current file
+    previous = "k",                   -- previous item
+    next = "j"                        -- next item
   },
 }
 
-local trouble_telescope = require("trouble.providers.telescope")
+local trouble_telescope = require("trouble.sources.telescope")
 local builtin = require 'telescope.builtin'
 
 local sendtoqf = function(loc)
@@ -423,10 +423,10 @@ require('telescope').setup {
       n = {
         ["q"] = require('telescope.actions').close,
         ["ff"] = sendtoqf,
-        ["<c-t>"] = trouble_telescope.open_with_trouble,
+        ["<c-t>"] = trouble_telescope.open,
       },
       i = {
-        ["<c-t>"] = trouble_telescope.open_with_trouble,
+        ["<c-t>"] = trouble_telescope.open,
         ["ff"] = require('telescope.actions').send_to_qflist,
       },
     },
@@ -556,8 +556,8 @@ require 'nvim-treesitter.configs'.setup {
   playground = {
     enable = true,
     disable = {},
-    updatetime = 25,         -- Debounced time for highlighting nodes in the playground from source code
-    persist_queries = false, -- Whether the query persists across vim sessions
+    updatetime = 25,             -- Debounced time for highlighting nodes in the playground from source code
+    persist_queries = false,     -- Whether the query persists across vim sessions
     keybindings = {
       toggle_query_editor = 'o',
       toggle_hl_groups = 'i',
@@ -673,6 +673,8 @@ function neogen_dwim()
   end
 end
 
+require("hoversplit").setup({})
+
 require("murdock")
 require("lir_setup")
 require("lualine_setup")
diff --git a/dot_vimrc b/dot_vimrc
index 3ba9369..8d953d5 100644
--- a/dot_vimrc
+++ b/dot_vimrc
@@ -46,6 +46,7 @@ set ruler
 
 " I hate split above, so make it split below. Likewise, to the right.
 set splitbelow
+set splitright
 " For autocomplete, follow requirements for nvim-compe
 set completeopt=menuone,noselect
 set signcolumn=yes
@@ -243,6 +244,7 @@ Plug 'creativenull/efmls-configs-nvim', { 'tag': 'v1.*' }
 "Plug 'Shougo/vimproc.vim'
 "Plug 'Shougo/vimfiler.vim'
 
+Plug 'roobert/hoversplit.nvim'
 Plug 'tamago324/lir.nvim'
 
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
@@ -288,7 +290,7 @@ luafile $HOME/.vim/nvim.lua
 
 " Code navigation shortcuts
 nnoremap <silent> gd <cmd>lua vim.lsp.buf.definition()<CR>
-nnoremap <silent> gi    <cmd>lua vim.lsp.buf.implementation()<CR>
+nnoremap <silent> gi   <cmd>lua require('telescope.builtin').lsp_implementations({initial_mode = "normal"})<cr>
 nnoremap <silent> gy   <cmd>lua vim.lsp.buf.type_definition()<CR>
 nnoremap <silent> K     <cmd>lua vim.lsp.buf.hover()<CR>
 nnoremap <silent> gs <cmd>lua vim.lsp.buf.signature_help()<CR>
@@ -296,7 +298,7 @@ nnoremap <silent> gR <cmd>lua vim.lsp.buf.rename()<CR>
 "nnoremap <silent> gr    <cmd>lua vim.lsp.buf.references()<CR>
 nnoremap <silent> gr   <cmd>lua require('telescope.builtin').lsp_references({initial_mode = "normal"})<cr>
 nnoremap <silent> g0    <cmd>lua vim.lsp.buf.document_symbol()<CR>
-nnoremap <silent> gW    <cmd>lua vim.lsp.buf.workspace_symbol()<CR>
+nnoremap <silent> gW   <cmd>lua require('telescope.builtin').lsp_workspace_symbols({initial_mode = "normal"})<cr>
 "nnoremap <silent> gd    <cmd>lua vim.lsp.buf.declaration()<CR>
 nnoremap <silent> ga    <cmd>lua vim.lsp.buf.code_action()<CR>
 "nnoremap <silent> ga   <cmd>lua require('telescope.builtin').lsp_code_actions({initial_mode = "normal"})<cr>
@@ -304,12 +306,15 @@ vnoremap <silent> ga <cmd>lua vim.lsp.buf.code_action()<CR>
 "vnoremap <silent> ga   :<C-U>lua require('telescope.builtin').lsp_range_code_actions({initial_mode = "normal"})<cr>
 "nnoremap <silent> ge    <cmd>lua vim.lsp.diagnostic.show_line_diagnostics({show_header = false, focusable = false})<CR>
 "nnoremap <silent> ge    <cmd>lua vim.diagnostic.open_float({focusable = false})<CR>
+nnoremap <silent> <leader>im <cmd>lua require'telescope'.extensions.goimpl.goimpl{}<CR>
+
 
 nnoremap <silent> <leader>xx <cmd>TroubleToggle<cr>
 nnoremap <silent> <leader>xq <cmd>lua vim.diagnostic.setqflist()<CR>
 "nnoremap <silent> <leader>nc    <cmd>lua neogen_dwim()<CR>
 nnoremap <silent> <leader>nc    <cmd>lua require('neogen').generate({ type = 'any' })<CR>
 nnoremap <silent> gm <cmd>lua require('lspimport').import()<CR>
+nnoremap <silent> <leader>K <cmd>lua require('hoversplit').vsplit_remain_focused()<CR>
 
 
 " Set updatetime for CursorHold