fix vim and a few more