some changes
disable vimode for now