vi mode for terminal and a couple snippet changes