diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json
index 427e9b0..5c75375 100644
--- a/.vim/coc-settings.json
+++ b/.vim/coc-settings.json
@@ -1,8 +1,10 @@
 {
     "suggest.timeout": 5000,
     "suggest.enablePreview": true,
-    "diagnostic.displayByAle": true,
+    "diagnostic.displayByAle": false,
+    "diagnostic.checkCurrentLine": true,
     "python.linting.flake8Enabled": true,
+    "python.venvFolders": [".virtualenvs"],
     "python.jediEnabled": true,
     "python.autoComplete.addBrackets": false,
     "languageserver": {
@@ -16,5 +18,9 @@
            }
          }
     }
-  }
+  },
+  "python.autoComplete.extraPaths": [
+    "${env:SPARK_HOME}/python",
+    "${env:SPARK_HOME}/python/pyspark"
+  ]
 }
diff --git a/.vimrc b/.vimrc
index cb27420..be84ddf 100644
--- a/.vimrc
+++ b/.vimrc
@@ -81,6 +81,10 @@ if exists('veonim')
 " set linespace=10
 endif
 
+if exists('gnvim')
+  set guifont=Droid\ Sans\ Mono\ Dotted:h15
+endif
+
 " Required:
 set runtimepath+=/home/bmichener/.vim/bundle/repos/github.com/Shougo/dein.vim
 
@@ -117,7 +121,7 @@ Plug 'bps/vim-textobj-python'
 " Plugins I NEED
 Plug 'scrooloose/nerdcommenter'
 Plug 'sjbach/lusty'
-Plug 'w0rp/ale'
+"Plug 'w0rp/ale'
 Plug 'airblade/vim-gitgutter'
 Plug 'vim-airline/vim-airline'
 Plug 'vim-airline/vim-airline-themes'
@@ -173,7 +177,7 @@ Plug 'derekwyatt/vim-scala', {'for': 'scala'}
     "\ 'do': 'bash install.sh',
     "\ }
 "Plug 'ensime/ensime-vim', { 'do': ':UpdateRemotePlugins' }
-Plug 'neoclide/coc.nvim', {'tag': '*', 'do': './install.sh'}
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
 
 " Plugins that do specific things
 Plug 'Shougo/vimproc.vim'
@@ -729,8 +733,8 @@ nnoremap <Leader>fn :lnext<CR>
 " Prev quickfix.
 nnoremap <Leader>fp :lprev<CR>
 "nnoremap <silent> <Leader>aa :<C-u>Denite -mode=normal -buffer-name=search-buffer grep<CR>
-nnoremap <silent> <Leader>ac :<C-u>Denite -resume -mode=normal -buffer-name=search-buffer<CR>
-nnoremap <silent> <Leader>aw :<C-u>DeniteCursorWord -mode=normal -buffer-name=search-buffer grep<CR>
+nnoremap <silent> <Leader>ac :<C-u>Denite -resume -buffer-name=search-buffer<CR>
+nnoremap <silent> <Leader>aw :<C-u>DeniteCursorWord -buffer-name=search-buffer grep<CR>
 call denite#custom#map('insert', '<Enter>', '<C-o>')
 call denite#custom#var('grep', 'command', ['pt'])
 call denite#custom#var('grep', 'default_opts',
@@ -740,6 +744,21 @@ call denite#custom#var('grep', 'pattern_opt', [])
 call denite#custom#var('grep', 'separator', ['--'])
 call denite#custom#var('grep', 'final_opts', [])
 call denite#custom#option('search-buffer', 'highlight_matched_char', 'deniteMatchedChar')
+autocmd FileType denite call s:denite_my_settings()
+function! s:denite_my_settings() abort
+  nnoremap <silent><buffer><expr> <CR>
+  \ denite#do_map('do_action')
+  nnoremap <silent><buffer><expr> d
+  \ denite#do_map('do_action', 'delete')
+  nnoremap <silent><buffer><expr> p
+  \ denite#do_map('do_action', 'preview')
+  nnoremap <silent><buffer><expr> q
+  \ denite#do_map('quit')
+  nnoremap <silent><buffer><expr> i
+  \ denite#do_map('open_filter_buffer')
+  nnoremap <silent><buffer><expr> <Space>
+  \ denite#do_map('toggle_select').'j'
+endfunction
 nnoremap <silent> <Leader>aa :<C-u>Denite -buffer-name=search-buffer grep<CR>
 "nnoremap <silent> <Leader>aa :<C-u>RipGrep!<CR>
 nnoremap <C-k> :<C-u>Files! `git rev-parse --show-toplevel`<CR>