Even more Blackjack improvements