diff --git a/vimrc b/vimrc
index f4c6325..6d49426 100644
--- a/vimrc
+++ b/vimrc
@@ -1,13 +1,13 @@
-set mouse=a cb=unnamed,unnamedplus wim=longest,list,full nocompatible backspace=indent,eol,start cmdheight=1 bg=dark nu rnu showcmd incsearch listchars=tab:\|\  list cot=menu,longest,preview si cpt=".,w,b,i" tf path+=** aw
+set mouse=a cb=unnamed,unnamedplus wim=longest,list,full nocompatible backspace=indent,eol,start cmdheight=1 bg=dark nu rnu showcmd incsearch listchars=tab:\|\  list cot=menu,longest,preview si sta cpt=".,w,b,i" tf path+=** aw
 filetype plugin on
 filetype indent on
 syntax on
 colorscheme delek
 
 cnoremap w!! execute 'silent! write !sudo tee % >/dev/null' <bar> edit! <CR>
-cnoremap install! execute 'silent! write !sudo make install' <CR>
+cnoremap i! execute 'silent! write !sudo make install' <CR>
 function! CleverTab()
-	if strpart( getline('.'), col('.')-2, col('.')-1 ) =~ '\w$'
+	if strpart( getline('.'), col('.')-2, 3) =~ '^\w'
 		return "\<C-X>\<C-I>"
 	else
 		return "\<Tab>"