diff --git a/vim/.vim/bindings.md b/vim/.vim/bindings.md
index 80e0c7c..795d6a5 100644
--- a/vim/.vim/bindings.md
+++ b/vim/.vim/bindings.md
@@ -1,5 +1,11 @@
 TODO: asciidoc
 
+General Vim
+    c-p, c-n
+        dumb completion in open buffers
+    c-i, c-o
+        back/forward a jump
+
 EasyAlign
     C-x in visual mode to do reg expression
 Vlime
@@ -54,3 +60,6 @@ Tmux
     c-b {v, h} window split
     c-b w new window
     tslime: ,t
+
+TODO YCM
+    <leader>gd goto definition
diff --git a/vim/.vimrc b/vim/.vimrc
index 6700f63..7336869 100755
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -123,8 +123,10 @@
     " Nnoremap <tab> %
     " Vnoremap <tab> %
     " Remap tab to jump by window
-    nnoremap <tab> <C-w>w
-    vnoremap <tab> <C-w>w
+    nnoremap <tab> :tabn<CR>
+    vnoremap <tab> :tabn<CR>
+    nnoremap <S-tab> :tabp<CR>
+    vnoremap <S-tab> :tabp<CR>
 
 "}}}
 
@@ -166,6 +168,7 @@
     nnoremap <leader>d k :r !date <cr>
 
     nnoremap <leader>k :vert new ~/.vim/bindings.md <cr>
+    tnoremap <leader><esc> <C-\><C-n>
 
 "}}}