diff --git a/vimrc b/vimrc
index f176475..c4ae8d9 100644
--- a/vimrc
+++ b/vimrc
@@ -553,7 +553,7 @@ function! MyFoldText() "{{{
     let g:foldtext_maxcolumn = 120
   endif
 
-  let l:linecount = v:foldend - v:foldstart - 1
+  let l:linecount = v:foldend - v:foldstart
   " don't display foldmarker braces
   let l:line = substitute(getline(v:foldstart), '\{\{\{', '', '')
   " don't display vim comment quotation marks
@@ -852,6 +852,8 @@ set undofile
 
 set clipboard=unnamedplus
 
+set viewoptions-=options
+
 set ignorecase
 set smartcase
 
@@ -1084,7 +1086,8 @@ iabbrev bgc: background-color:;<left>
 " persistent folds {{{
 augroup AutoSaveFolds
   autocmd!
-  autocmd BufWinLeave ?* mkview
+  " autocmd BufWinLeave ?* mkview
+  autocmd BufWrite ?* mkview
   autocmd BufWinEnter ?* silent loadview
 augroup END
 "}}}