Add card info and fix bug