Added new cards, some error fixed