some more vim changes