Improve some of vim