tweaks to improve data-binding