Vim improvements