Improved the Vim support