Fix: bugs in capture and isolated marbles