diff --git a/experiment_designer/form_main.lfm b/experiment_designer/form_main.lfm
index 187ddcd..ef07912 100644
--- a/experiment_designer/form_main.lfm
+++ b/experiment_designer/form_main.lfm
@@ -3,12 +3,12 @@ object FormDesigner: TFormDesigner
   Height = 635
   Top = 44
   Width = 656
-  HorzScrollBar.Page = 346
-  VertScrollBar.Page = 616
+  HorzScrollBar.Page = 387
+  VertScrollBar.Page = 520
   AutoScroll = True
   Caption = 'Planejar Experimento'
   ClientHeight = 616
-  ClientWidth = 646
+  ClientWidth = 656
   Menu = MainMenu1
   OnActivate = FormActivate
   OnCreate = FormCreate
@@ -18,12 +18,12 @@ object FormDesigner: TFormDesigner
   LCLVersion = '1.6.2.0'
   object PageControl: TPageControl
     Left = 0
-    Height = 744
+    Height = 616
     Top = 0
-    Width = 646
-    ActivePage = TabSheetExperiment
+    Width = 656
+    ActivePage = TabSheetContingencies
     Align = alClient
-    TabIndex = 0
+    TabIndex = 2
     TabOrder = 0
     object TabSheetExperiment: TTabSheet
       Caption = 'Experimento'
@@ -32,8 +32,8 @@ object FormDesigner: TFormDesigner
       ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 1
-      ClientHeight = 711
-      ClientWidth = 640
+      ClientHeight = 583
+      ClientWidth = 650
       object LabelResearcherName: TLabel
         Left = 0
         Height = 15
@@ -237,8 +237,8 @@ object FormDesigner: TFormDesigner
       ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 1
-      ClientHeight = 711
-      ClientWidth = 640
+      ClientHeight = 583
+      ClientWidth = 650
       object ComboCurrentCondition: TComboBox
         Left = 0
         Height = 27
@@ -571,8 +571,8 @@ object FormDesigner: TFormDesigner
       ChildSizing.EnlargeHorizontal = crsHomogenousChildResize
       ChildSizing.Layout = cclLeftToRightThenTopToBottom
       ChildSizing.ControlsPerLine = 1
-      ClientHeight = 711
-      ClientWidth = 640
+      ClientHeight = 583
+      ClientWidth = 650
       Enabled = False
       object RGContingencyType: TRadioGroup
         Left = 0
diff --git a/experiment_designer/form_main.pas b/experiment_designer/form_main.pas
index e040237..909e697 100644
--- a/experiment_designer/form_main.pas
+++ b/experiment_designer/form_main.pas
@@ -520,6 +520,8 @@ begin
     Result += 'CÍRCULOS PREENCHIDOS,';
   if ChkCleanDots.Checked then
     Result += 'CÍRCULOS VAZADOS,';
+  if ChkDotsCleanDots.Checked then
+    Result += 'CÍRCULOS AMBOS,';
 end;
 
 function TFormDesigner.GetPromptQuestionStringFromCGQuestion: string;
@@ -562,6 +564,11 @@ begin
     ChkCleanDots.Checked := True
   else
     ChkCleanDots.Checked := False;
+
+  if Pos('CÍRCULOS AMBOS', UpperCase(AMatrixType)) > 0 then
+    ChkDotsCleanDots.Checked := True
+  else
+    ChkDotsCleanDots.Checked := False;
 end;
 
 procedure TFormDesigner.SetCGQuestion(AQuestionStyle: string);
@@ -1295,7 +1302,7 @@ var
             end;
           Section.Clear;
           ComboCurrentCondition.Items[i] :=
-            SectionName + '|' + ExtractDelimited(2, ComboCurrentCondition.Items[i], ['|']);
+            SectionName + '|' + ReadString(SectionName,KEY_COND_NAME,'');
         end;
     Section.Free;
   end;
@@ -1314,12 +1321,12 @@ begin
       case ComboCurrentCondition.Items.Count of
         0: {do nothing};
         1..MaxInt:
-          if i = 1 then
+          if i = 0 then
             ComboCurrentCondition.ItemIndex := i
           else
             ComboCurrentCondition.ItemIndex := i -1;
       end;
-      ListBoxContingencies.Items.Text := ComboCurrentCondition.Items.Text;
+      ListBoxConditions.Items.Text := ComboCurrentCondition.Items.Text;
       TabSheetContingencies.Enabled := ComboCurrentCondition.Items.Count > 0;
     end;
 end;
@@ -1335,7 +1342,7 @@ var
     Keys.BeginUpdate;
     with FExperiment do
       begin
-        Keys.Values[LC + KEY_NAME] := ReadString(LS,LC+KEY_NAME,'');
+        Keys.Values[LC + KEY_CONT_NAME] := ReadString(LS,LC+KEY_CONT_NAME,'');
         Keys.Values[LC + KEY_CRITERIA] := ReadString(LS, LC + KEY_CRITERIA,'');
         Keys.Values[LC + KEY_CONSEQUE] := ReadString(LS, LC + KEY_CONSEQUE,'');
         Keys.Values[LC + KEY_CONSEQUE_MESSAGE_PREPEND] := ReadString(LS, LC + KEY_CONSEQUE_MESSAGE_PREPEND,'');
@@ -1344,7 +1351,7 @@ var
       end;
     Keys.EndUpdate;
   end;
-
+  //todo:fix bug in here
   procedure Reorder(Index:integer);
   var
     i: integer;
@@ -1360,7 +1367,7 @@ var
             KeyPrefix := ExtractDelimited(1, ComboCurrentContingency.Items[i], ['|']);
             ReadContingencyValuesInSection(SectionName,KeyPrefix, SectionKeys);
             EraseContingency(SectionName,KeyPrefix);
-            KeyPrefix := ExtractFileNameWithoutExt(KeyPrefix) + '.' + IntToStr(i);
+            KeyPrefix := ExtractFileNameWithoutExt(KeyPrefix) + '.' + IntToStr(i + 1);
             for Line in SectionKeys do
               begin
                 KeyName := SectionKeys.ExtractName(Line);
@@ -1368,7 +1375,7 @@ var
               end;
             SectionKeys.Clear;
             ComboCurrentContingency.Items[i] :=
-              KeyPrefix + '|' + ExtractDelimited(2, ComboCurrentContingency.Items[i], ['|']);
+              KeyPrefix + '|' + ReadString(SectionName,KeyPrefix+KEY_CONT_NAME,'');
           end;
       end;
     SectionKeys.Free;
@@ -1381,8 +1388,8 @@ begin
       MustReorder := i < ComboCurrentContingency.Items.Count - 1;
       LS := ExtractDelimited(1, ComboCurrentCondition.Text, ['|']);
       LC := ExtractDelimited(1, ComboCurrentContingency.Text, ['|']);
-      ComboCurrentContingency.Items.Delete(i);
       EraseContingency(LS,LC);
+      ComboCurrentContingency.Items.Delete(i);
 
       if MustReorder then
         Reorder(i);
@@ -1390,7 +1397,7 @@ begin
       case ComboCurrentContingency.Items.Count of
         0: {do nothing};
         1..MaxInt:
-          if i = 1 then
+          if i = 0 then
             ComboCurrentContingency.ItemIndex := i
           else
             ComboCurrentContingency.ItemIndex := i -1;
--
libgit2 0.21.2