card effect repaint fix

and more fix