More modifications to basic.vim