update to more extensive vimscripts