Fix unfold end condition, update circles main