more bindings and cleanup