more fixes to vim