Updated deck and card handling