diff --git a/nvim/.config/nvim/maps.vim b/nvim/.config/nvim/maps.vim
index 73edac6..1cc7ccb 100644
--- a/nvim/.config/nvim/maps.vim
+++ b/nvim/.config/nvim/maps.vim
@@ -194,7 +194,11 @@ nnoremap <leader>wF :execute(":call SearchNotes()")<cr>
 " localleader is used when it is specific to the local file
 nnoremap <leader>wf :WikiFzfPages<cr>
 nnoremap <leader>l :WikiFzfTags<cr>
-nnoremap <localleader>l :WikiFzfToc<cr>
+" use default TOC shortcut for viewing wikitoc if in correct filetype
+augroup wikitoc
+  autocmd!
+  autocmd Filetype markdown,pandoc nnoremap <buffer> gO :WikiFzfToc<cr>
+augroup END
 
 " overwrites some default mappings I don't use, or that interfere with my own
 " mappings TODO: currently this just assigns bogus shortcuts, since the plugin grumbles
@@ -210,7 +214,10 @@ let g:wiki_mappings_local = {
       \ '<plug>(wiki-graph-out)' : '<leader>wG',
       \}
 " additional zettelkasten mapping
-au Filetype markdown,pandoc nnoremap <cr> :ZettelOpenAtCursor<cr>
+augroup zettelkasten
+  autocmd!
+  autocmd Filetype markdown,pandoc nnoremap <cr> :ZettelOpenAtCursor<cr>
+augroup END
 
 " Mostly dealing with Prose writing from here on out
 " Format current Paragraph (esp useful in prose writing)
diff --git a/nvim/.config/nvim/plugin/personal/highlightyank.vim b/nvim/.config/nvim/plugin/personal/highlightyank.vim
index f219879..f934dc9 100644
--- a/nvim/.config/nvim/plugin/personal/highlightyank.vim
+++ b/nvim/.config/nvim/plugin/personal/highlightyank.vim
@@ -1,5 +1,5 @@
 " will highlight any text which has been yanked
-augroup LuaHighlight
+augroup LuaHighlightYank
   autocmd!
-  autocmd TextYankPost * silent! lua require'vim.highlight'.on_yank()
+  autocmd TextYankPost * silent! lua require'vim.highlight'.on_yank{timeout=500}
 augroup END