cleanup/added some bindings