VIM improvements