Various changes
Correct Scoring function
Prevent J from being drawn to top of initial discard pile