added card generation validation and a couple of text swaps
fixed merge issues