hopefully some card fixes and prematch cleanup