Tweaks and improvements to cards