fix the data bindings (to a reasonable degree)