better handling of deck card draw logic