Several vim changes