Index: trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java	(revision 69)
+++ trunk/src/scriptbuilder/gui/IncidentPaletteFrame.java	(revision 73)
@@ -35,6 +35,4 @@
     JPanel panelAdd;
 
-    private int incidentCount;
-
     /**
      * Creates new form IncidentPaletteFrame
@@ -50,6 +48,4 @@
         incidentList = new ArrayList<ScriptIncident>();
 
-        incidentCount = 0;
-
         panelAdd.setLayout(new GridLayout(0, 1));
 
@@ -121,11 +117,9 @@
     private void loadPanels(ArrayList<ScriptIncident> incList)
     {
-        incidentCount = 0;
         scrollAddPanels.setViewport(new JViewport());
         panelAdd.removeAll();
-        labelFileCount.setText("Found "+incList.size()+" available incidents.");
+        labelFileCount.setText("Found " + incList.size() + " available incidents.");
         for (ScriptIncident inc : incList)
         {
-            ++incidentCount;
 
             panelAdd.add(new IncidentPaletteAddPanel(inc, this));
Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 61)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.java	(revision 73)
@@ -293,4 +293,8 @@
         eventButtons.add(facilitatorEvalButton);
         eventButtons.add(radioEvalButton);
+        
+        incidentNumber.setText(""+this.theIncident.number);
+        incidentName.setText(""+this.theIncident.name);
+        incidentDescription.setText(""+this.theIncident.description);
     }
 
@@ -330,5 +334,5 @@
         {
             TimeSlice slice = ((SliceChangedEvent) arg).slice;
-
+            
             DefaultListModel model = new DefaultListModel();
             for (I_ScriptEvent e : slice.events)
Index: trunk/src/scriptbuilder/gui/IncidentEditorFrame.form
===================================================================
--- trunk/src/scriptbuilder/gui/IncidentEditorFrame.form	(revision 61)
+++ trunk/src/scriptbuilder/gui/IncidentEditorFrame.form	(revision 73)
@@ -765,6 +765,6 @@
             <Component class="javax.swing.JTextArea" name="incidentDescription">
               <Properties>
+                <Property name="editable" type="boolean" value="false"/>
                 <Property name="columns" type="int" value="20"/>
-                <Property name="editable" type="boolean" value="false"/>
                 <Property name="lineWrap" type="boolean" value="true"/>
                 <Property name="rows" type="int" value="5"/>
Index: trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java
===================================================================
--- trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 62)
+++ trunk/src/scriptbuilder/gui/ScriptBuilderFrame.java	(revision 73)
@@ -1914,5 +1914,7 @@
             if (inc != null)
             {
-                new IncidentEditorFrame(inc).setVisible(true);
+                IncidentEditorFrame editor = new IncidentEditorFrame(inc);
+                script.addObserver(editor);
+                editor.setVisible(true);
             }
         }