Several changes, mainly getting display of cards working