diff --git a/.vimrc b/.vimrc
index 0f3e816..8893dad 100644
--- a/.vimrc
+++ b/.vimrc
@@ -6,11 +6,13 @@ set backup
 set backupdir=~/.vim/backup/
 set dir=~/.vim/tmp
 
-set enc=utf-8
-set fenc=utf-8
+set encoding=utf-8
+set fileencoding=utf-8
 set termencoding=utf-8
 set nu
+set scrolloff=7
 set backspace=indent,eol,start "http://vimhelp.appspot.com/options.txt.html#%27backspace%27
+set clipboard=unnamed
 
 set tabstop=4
 set softtabstop=4
@@ -19,6 +21,8 @@ set smartindent
 set smarttab
 set expandtab
 
+set linebreak
+
 set t_Co=256
 colorscheme wombat256mod
 "colorscheme foursee
@@ -90,6 +94,8 @@ nmap \b <Esc>:BufExplorer<cr>
 nmap <S-Tab> :bn<cr>
 imap <S-Tab> <esc>:bn<cr>i
 vmap <S-Tab> <esc>:bn<cr>i
+"nnoremap <c-n> :bnext<cr>
+"nnoremap <c-p> :bprev<cr>
 
 "------------------------------------------------------------------------------
 " syntastic