move bindings around, fix bug