Fixed shuffle on new deck, other minor fixes