Added more w/s bindings