Added new bindings, surround, and new options