VIM improvments