Fixed some logic issues with card selection

Rest of game should play properly?