diff --git a/.vimrc b/.vimrc
index 8bac8c5..3f579ae 100644
--- a/.vimrc
+++ b/.vimrc
@@ -648,8 +648,9 @@ if v:version >= 800
                 if has_key(g:LanguageClient_serverCommands, &filetype)
                         nmap <buffer> <silent> K <Plug>(lcn-hover)
                         nmap <buffer> <silent> gd <Plug>(lcn-definition)
+                        nmap <buffer> <silent> gr <Plug>(lcn-references)
                         nmap <buffer> <silent> cr <Plug>(lcn-rename)
-                        map <C-F1> <Plug>(lcn-menu)
+                        nmap <C-F1> <Plug>(lcn-menu)
                 endif
         endfunction
         autocmd FileType * call LC_maps()
diff --git a/.zsh/00_basic.zsh b/.zsh/00_basic.zsh
index 6010f75..447c37a 100644
--- a/.zsh/00_basic.zsh
+++ b/.zsh/00_basic.zsh
@@ -53,6 +53,11 @@ bindkey "^[[B" down-line-or-beginning-search # Down
 #bindkey "^[[A" up-line-or-search     ## up arrow for back-history-search
 #bindkey "^[[B" down-line-or-search   ## down arrow for fwd-history-search
 
+#edit current cmdline in vim with Ctrl-x Ctrl-e
+autoload -z edit-command-line
+zle -N edit-command-line
+bindkey "^X^E" edit-command-line
+
 unsetopt beep
 #force emacs binding for tmux && screen
 bindkey -e
diff --git a/.zsh/40_function.zsh b/.zsh/40_function.zsh
index 291c326..49d30c8 100755
--- a/.zsh/40_function.zsh
+++ b/.zsh/40_function.zsh
@@ -91,7 +91,7 @@ fi
 }
 
 mgrep () {
-    find . -name .repo -prune -o -name .git -prune -o -path ./out -prune -o -regextype posix-egrep -iregex '(.*\/Makefile|.*\/Makefile\..*|.*\.make|.*\.mak|.*\.mk)' -type f -print0 | xargs -0 grep --color -n "$@"
+    find . -name .repo -prune -o -name .git -prune -o -path ./out -prune -o -regextype posix-egrep -iregex '(.*\/Makefile|.*\/Makefile\..*|.*\.make|.*\.mak|.*\.mk|CMakeLists.txt)' -type f -print0 | xargs -0 grep --color -n "$@"
 }
 
 bbgrep () {