vim related changes