I have changed more stuff. I'v added more commands that work for evil
mode.