massive vim changes