Various bug fixes, data bindings.