diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim
index 9870d3c..c5c8c58 100644
--- a/vim/config/keyboard.vim
+++ b/vim/config/keyboard.vim
@@ -40,7 +40,7 @@
 "    <Ctrl-ScrollDown>    | (A) -> scroll left a few characters at a time
 "    <Alt-ScrollUp>       | (A) -> scroll right one character at a time
 "    <Alt-ScrollDown>     | (A) -> scroll left one character at a time
-"    <Shift-MiddleClick>  | (A) -> unbind this from vim so xorg can paste
+"    <Shift-MClick>       | (A) -> unbind this from vim so xorg can paste
 "
 "  (tabs)
 "    <Leader>9            | (A) -> go to the next open tab
@@ -170,20 +170,35 @@
 "  (help)
 "    q                    | (N) -> close the dialog
 "
+"  (markdown)
+"    <F8>                 | (A) -> show heading TOC instead of the taglist
+"
+"  (markdown toc)
+"    q                    | (A) -> close the toc
+"    <F8>                 | (A) -> close the toc
+"    <Space>              | (A) -> select heading but remain in toc
+"    <LClick><LClick>     | (A) -> select heading to edit
+"    <Left>               | (A) -> up
+"    <Right>              | (A) -> down
+"    h                    | (A) -> j
+"    l                    | (A) -> k
+"
 "  (vimfiler)
-"    <LMouse><LMouse>     | (N) -> edit selected file
-"    <LMouse>             | (N) -> same as normal + justify on the left
-"    <MMouse>             | (N) -> same as the left mouse
-"    <RMouse>             | (N) -> same as the left mouse
+"    <LClick><LClick>     | (N) -> edit selected file
 "    <Right>              | (N) -> map to l, which opens a directory
 "    <Left>               | (N) -> map to h, which goes up one directory
 "    '                    | (N) -> edit the selected file
 "    n                    | (N) -> start editing a new file
 "
+"  (markdown toc + vimfiler)
+"    <LClick>             | (N) -> left click + left justify the cursor
+"    <MClick>             | (N) -> same as the left click
+"    <RClick>             | (N) -> same as the left click
+"
 "  (gundo)
-"    <LeftMouse>          | (N) -> same as normal + justify on the left
-"    <MiddleMouse>        | (N) -> same as the left mouse
-"    <RightMouse>         | (N) -> same as the left mouse
+"    <LeftClick>          | (N) -> same as normal + justify on the left
+"    <MiddleClick>        | (N) -> same as the left mouse
+"    <RightClick>         | (N) -> same as the left mouse
 "    <Right>              | (N) -> same as down
 "    l                    | (N) -> same as j
 "    <Left>               | (N) -> same as Up
@@ -461,16 +476,31 @@
     autocmd FileType help nnoremap <buffer> <silent><expr> ?> ':q<CR>'
     autocmd FileType help nnoremap <buffer> <silent><expr> ?< ':q<CR>'
 
+    "markdown launch table of contents instead of the tagbar
+    autocmd FileType mkd noremap <buffer> <silent><expr> <F8> ':Toc<CR><C-w>L'
+
+    "markdown table of contents
+    autocmd FileType qf noremap <buffer> <silent><expr> q ':q<CR>'
+    autocmd FileType qf noremap <buffer> <silent><expr> <F8> ':q<CR>'
+    autocmd FileType qf noremap <buffer> <Space> <CR><C-w>p
+    autocmd FileType qf noremap <buffer> <2-LeftMouse> <CR>
+    autocmd FileType qf noremap <buffer> <Left> <Up>
+    autocmd FileType qf noremap <buffer> <Right> <Down>
+    autocmd FileType qf noremap <buffer> h j
+    autocmd FileType qf noremap <buffer> l k
+
     "vimfiler
     autocmd FileType vimfiler nmap <buffer> <2-LeftMouse> <Plug>(vimfiler_edit_file)
-    autocmd FileType vimfiler nmap <buffer> <LeftMouse> <LeftMouse>0
-    autocmd FileType vimfiler nmap <buffer> <MiddleMouse> <LeftMouse>
-    autocmd FileType vimfiler nmap <buffer> <RightMouse> <LeftMouse>
     autocmd FileType vimfiler nmap <Right> l
     autocmd FileType vimfiler nmap <Left> h
     autocmd FileType vimfiler nmap ' e
     autocmd FileType vimfiler nmap n q
 
+    "markdown toc and vimfiler
+    autocmd FileType qf,vimfiler nmap <buffer> <LeftMouse> <LeftMouse>0
+    autocmd FileType qf,vimfiler nmap <buffer> <MiddleMouse> <LeftMouse>
+    autocmd FileType qf,vimfiler nmap <buffer> <RightMouse> <LeftMouse>
+
     "gundo
     autocmd FileType gundo nmap <buffer> <LeftMouse> <LeftMouse>0l
     autocmd FileType gundo nmap <buffer> <MiddleMouse> <LeftMouse>
@@ -492,25 +522,25 @@
 
 "DISABLED MAPPINGS: {{{
     "remove incompatible toggles from specific filetypes
-    autocmd Filetype gundo,vimfiler noremap <F1> <Nop>
-    autocmd Filetype gundo,vimfiler,help noremap <F2> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <F3> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <C-Up> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <C-k> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <C-Down> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <C-j> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <C-Right> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <C-l> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <C-Left> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <C-h> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <S-Up> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <S-k> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <S-Down> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <S-j> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <S-Right> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <S-l> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <S-Left> <Nop>
-    autocmd Filetype gundo,vimfiler noremap <S-h> <Nop>
+    autocmd Filetype qf,gundo,vimfiler noremap <F1> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler,help noremap <F2> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <F3> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <C-Up> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <C-k> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <C-Down> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <C-j> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <C-Right> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <C-l> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <C-Left> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <C-h> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <S-Up> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <S-k> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <S-Down> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <S-j> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <S-Right> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <S-l> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <S-Left> <Nop>
+    autocmd Filetype qf,ggundo,vimfiler noremap <S-h> <Nop>
 "}}}
 
 "ALIASES: COMMAND SHORTCUTS {{{
diff --git a/vim/config/settings.vim b/vim/config/settings.vim
index 0e50686..8898931 100644
--- a/vim/config/settings.vim
+++ b/vim/config/settings.vim
@@ -46,6 +46,9 @@
     set smarttab expandtab autoindent tabstop=4 shiftwidth=4 "configure tabs
     set laststatus=2 showcmd statusline=%F%m%r%h%w[%L][%{&ff}]%y[%p%%][%04l,%04v] "statusline init and config
     set hlsearch incsearch ignorecase smartcase "configure search
+    set diffopt=foldcolumn:0,filler "vimdiff default settings
+    set formatoptions=roqnl12 "how automatic formatting is to be done
+    set foldmethod=syntax foldcolumn=1 foldlevel=3 "fold layers 3 or more deep
     let &showbreak="+ " "when linewrap is enabled, show wrapped lines with +++
 
     "load the system version of matchit if another hasn't already been
@@ -74,14 +77,12 @@
     autocmd FileType gitcommit,notes,mail,notmuch,text setlocal spell
     autocmd FileType notes,mail,notmuch,mkd,text setlocal nonumber
     autocmd FileType mail,notmuch,text setlocal wrap
-
-    "help specific settings
     autocmd FileType help* wincmd L "help windows always open vertically
-    autocmd FileType help* vertical res 80
-    autocmd FileType help* setlocal nowrap nocursorline nocursorcolumn "help windows don't wrap
+    autocmd FileType help* vertical resize 80 "set the window size to 80 cols
+    autocmd FileType help* setlocal nocursorline "remove the horizontal cursor line
+    autocmd BufEnter,FileType qf,help* setlocal nowrap nocursorcolumn "disable text wrapping and the vertical cursor line
 
-    "set vimdiff settings
-    setlocal diffopt=foldcolumn:0,filler
+    "settings for buffers in diff mode
     autocmd VimEnter,FilterWritePre * if &diff|setlocal nofoldenable|endif
     autocmd VimEnter * if &diff|wincmd H|endif
 
@@ -92,9 +93,6 @@
             \       setlocal omnifunc=syntaxcomplete#Complete |
             \   endif
     endif
-
-    set formatoptions=roqnl12
-    set foldmethod=syntax foldcolumn=1 foldlevel=3 "fold layers 3 or more deep
 "}}}
 
 "GVIM: GUI CONFIG OPTIONS {{{