diff --git a/nvimrc b/nvimrc
index 7d3fcb5..6fdb9cd 100644
--- a/nvimrc
+++ b/nvimrc
@@ -471,6 +471,7 @@ require 'nvim-treesitter.configs'.setup {
   highlight = {
     enable = true, 
     disable = {"vim"},
+    additional_vim_regex_highlighting = true,
   },
   incremental_selection = {
     enable = true,
@@ -509,9 +510,9 @@ require 'nvim-treesitter.configs'.setup {
       },
     },
     refactor = {
+      enable = true,
       -- TODO: navigation broken.
       navigation = {
-        enable = true,
         keymaps = {
           goto_next_usage = "]r",
           goto_previous_usage = "[r",
diff --git a/vim/after/ftplugin/go.vim b/vim/after/ftplugin/go.vim
index 6b222d3..b5f158f 100644
--- a/vim/after/ftplugin/go.vim
+++ b/vim/after/ftplugin/go.vim
@@ -43,6 +43,8 @@ let g:go_highlight_diagnostic_errors = 0
 let g:go_highlight_diagnostic_warnings = 0
 let g:go_highlight_trailing_whitespace_error=0
 
+let g:go_fmt_command = 'goimports'
+
 " g:go_statusline_duration doesn't seem to work accurately, but does help
 " reduce the time the build/test success messages are shown in the status
 " line.