Improve evil's state switching through key-chord. Add bookmark+.