Randomize cards fix + some minor changes.