More vim enhancements