diff --git a/.vimrc b/.vimrc
index 2bbfebfb64b1647b16cda80606cda8d01761bb32..36c721ecd7373d6517c79690d27f89bc161769e2 100644
--- a/.vimrc
+++ b/.vimrc
@@ -7,11 +7,10 @@ 	Plug 'airblade/vim-gitgutter'
 	Plug 'ctrlpvim/ctrlp.vim'
 call plug#end()
 
-set laststatus=2 encoding=utf8 spelllang=en_us tabstop=4 shiftwidth=4
+set path+=** laststatus=2 encoding=utf8 spelllang=en_us tabstop=4 shiftwidth=4
 set number relativenumber autoindent cursorline ignorecase signcolumn=yes
 set hidden nowrap nobackup noswapfile noundofile autoread updatetime=300
-set hlsearch incsearch backspace=indent,eol,start path+=**
-set completeopt=menuone,noinsert,noselect,longest
+set hlsearch incsearch backspace=indent,eol,start completeopt=menuone
 colorscheme wildcharm
 
 nnoremap <C-Right> :bnext<cr>
@@ -19,8 +18,8 @@ nnoremap <C-Left> :bprevious<cr>
 nnoremap <C-q> :copen<cr>
 nnoremap <C-b> :CtrlPBuffer<cr>
 nnoremap <Leader>q :nohlsearch<cr>
-nnoremap <Leader>c :silent call system('ctags -R .')<CR>
-nnoremap <leader>g :vimgrep /<C-r><C-w>/ %<CR>:copen<CR>
+nnoremap <Leader>c :silent call system('ctags --c++-kinds=+p -R .')<CR>
+nnoremap <leader>g :vimgrep /<C-r><C-w>/ **/*<CR>:copen<CR>
 
 let g:ctrlp_use_caching = 0
 let g:ctrlp_working_path_mode = ''