Improving a few things on vim.