various vim updates