changed some more card lib stuff