Vim changes and other stuff.