vim and misc changes