VIM: some changes