Further vim enhancements