diff --git a/init.lua b/init.lua
index a578bd5..07bcd10 100644
--- a/init.lua
+++ b/init.lua
@@ -19,7 +19,7 @@ if fn.hostname() == 'tappy' then
 	g.neovide_refresh_rate = 144
 end
 
-opt.guicursor:append('a:blinkon1000-blinkoff1000-blinkwait1000')  -- Blink cursor once a second for all modes
+opt.guicursor:append('a:blinkon1500-blinkoff1500-blinkwait1200')  -- Blink cursor once every 1.5 seconds
 o.mouse = 'a'                 -- Enable mouse input
 o.termguicolors = true        -- Enable 24bit terminal colors
 g.neovide_confirm_quit = 1    -- Confirm closing neovide window when changes are unsaved
@@ -406,7 +406,7 @@ require('lazy').setup({
 			}
 		}
 		lspconfig.nil_ls.setup {}
-		lspconfig.pyright.setup {}
+		lspconfig.basedpyright.setup {}
 		lspconfig.vimls.setup {}
 
 		-- TODO decide what to do with autocmd
@@ -635,6 +635,7 @@ require('lazy').setup({
 			end)()
 		}
 	}},
+	{'dmmulroy/ts-error-translator.nvim', opts = {}},
 	{'nvimtools/none-ls.nvim', dependencies = {'nvim-lua/plenary.nvim'}, config = function()
 		local null_ls = require'null-ls'
 		null_ls.setup {
@@ -1005,8 +1006,8 @@ require('lazy').setup({
 		require'which-key'.register {
 			['<Leader>r'] = {
 				name = 'Overseer (run tasks)',
-				r = {'<Cmd>OverseerToggle right<CR>', 'Open' },
-				R = {'<Cmd>OverseerToggle bottom<CR>', 'Open (bottom)' },
+				r = {'<Cmd>OverseerToggle bottom<CR>', 'Open' },
+				R = {'<Cmd>OverseerToggle right<CR>', 'Open (right)' },
 				n = {'<Cmd>OverseerRun<CR>', 'New task' },
 				c = {'<Cmd>OverseerRunCmd<CR>', 'Run shell command' },
 				l = {'<Cmd>OverseerLoadBundle!<CR>', 'Load task list'},
@@ -1122,14 +1123,25 @@ require('lazy').setup({
 		require'telescope'.load_extension('dap')
 		require'telescope'.load_extension('undo')
 	end},
-	{'nvim-neotest/neotest', dependencies = {'rcasia/neotest-java', 'nvim-neotest/neotest-vim-test', 'rouge8/neotest-rust'}, config = function()
+	{'nvim-neotest/neotest', dependencies = {
+		'nvim-neotest/neotest-vim-test',
+		'rouge8/neotest-rust',
+	}, config = function()
 		require'neotest'.setup {
 			adapters = {
-				require'neotest-java' {},
-				require'neotest-vim-test' {},
+				require'neotest-vim-test' { allow_file_types = {'java'} },
 				require'neotest-rust' {},
 			}
 		}
+		require'which-key'.register {
+			['<Leader>x'] = {
+				name = 'Test',
+				s = {'<Cmd>Neotest summary<CR>','Summary'},
+				a = {'<Cmd>Neotest attach<CR>', 'Attach to running test'},
+				k = {'<Cmd>Neotest stop<CR>', 'Stop'},
+				o = {'<Cmd>Neotest output-panel<CR>', 'Output'}
+			}
+		}
 	end},
 	{'kyazdani42/nvim-tree.lua', opts = {
 		actions = {