Fix insert mode name; add normal mode handler