lots of Vim updates