Tweaks and improvements to cards

Contains the 'fixes' and improvements on playing cards that should have already been merged in #6521 but accidentally got taken out of the PR just before its merge.