Added VIM keybindings and substring search