fixed yet more card bugs!