Revised of cards, few bug fixed