more keymapping moves to avoid conflicts with vi mode