diff --git a/vim/_vimrc b/vim/_vimrc
index 43790d3..2e0ee33 100644
--- a/vim/_vimrc
+++ b/vim/_vimrc
@@ -32,13 +32,14 @@
     Plug 'axvr/zepl.vim'
     " Plug 'kovisoft/slimv'
     Plug 'tpope/vim-vinegar'
-    Plug 'preservim/nerdtree'
+    " Plug 'preservim/nerdtree'
     Plug 'vimwiki/vimwiki'
     Plug 'simnalamburt/vim-mundo'
     Plug 'tpope/vim-dadbod'
     Plug 'junegunn/gv.vim'
     Plug 'rbong/vim-flog'
     Plug 'tpope/vim-unimpaired'
+    Plug 'junegunn/goyo.vim'
     " Clojure
     Plug 'guns/vim-clojure-static' " syntax
     Plug 'tpope/vim-fireplace'
@@ -49,6 +50,9 @@
     Plug 'mattn/emmet-vim'
     " Plug 'tpope/vim-salve'
     Plug 'chrisbra/colorizer'
+    " Plug 'ycm-core/YouCompleteMe'
+    Plug 'vim-pandoc/vim-pandoc'
+    Plug 'vim-pandoc/vim-pandoc-syntax'
     " cljfold
 
     " Todo:
@@ -117,6 +121,7 @@
     set t_vb=                      " No visual bell ever
     let g:sneak#use_ic_scs=1
     set virtualedit=block
+    let g:netrw_keepdir=0          " cwd follows netrw location
 "}}} 
 
 " searching {{{
@@ -235,6 +240,7 @@
     nnoremap <C-k> <C-w>k
     nnoremap <C-l> <C-w>l
     nnoremap <C-c> :close <cr>
+    " TODO remap to something else
     nnoremap <C-n> :bn <cr>
     " Term  mode
     tnoremap <C-h> <C-w>h
@@ -399,14 +405,6 @@ command! -register CopyMatches call CopyMatches(<q-reg>)
 
 " }}}
 
-" vimrc {{{
-    " source $MYVIMRC reloads the saved $MYVIMRC
-    :nmap <Leader>s :source $MYVIMRC
-
-    " opens $MYVIMRC for editing, or use :tabedit $MYVIMRC
-    :nmap <Leader>v :e $MYVIMRC
-"}}}
-
 " gvim {{{
     set guioptions=Ace
     set guifont=Consolas:h11