Vim: random improvements