Fix term in .vimrc and make several minor improvements