properly retain addresses, fix card display issue