lots of bindings tweaks