more changes for vi mode