various vim changes