Update and fix vim