Some bindings, some tweaks