Index: /trunk/src/scriptbuilder/structures/TimeSlice.java
===================================================================
--- /trunk/src/scriptbuilder/structures/TimeSlice.java	(revision 35)
+++ /trunk/src/scriptbuilder/structures/TimeSlice.java	(revision 37)
@@ -291,5 +291,5 @@
         return ev instanceof AudioEvent || ev instanceof UnitEvent
                 || ev instanceof ParamicsEvent || ev instanceof TowEvent
-                || ev instanceof WitnessEvent;
+                || ev instanceof WitnessEvent || ev instanceof CADEvent;
     }
 }
Index: /trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java
===================================================================
--- /trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java	(revision 36)
+++ /trunk/src/scriptbuilder/structures/events/ActivityLogEvaluationEvent.java	(revision 37)
@@ -54,7 +54,10 @@
     {
         String output = openTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag);
-        output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-        output += expectedAction;
-        output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        for (String str : expectedAction)
+        {
+            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+            output += str;
+            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        }
         output += closeTag(ELEMENT.ACTIVITY_LOG_EVALUATION.tag);
         
Index: /trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java
===================================================================
--- /trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java	(revision 36)
+++ /trunk/src/scriptbuilder/structures/events/RadioEvaluationEvent.java	(revision 37)
@@ -55,7 +55,10 @@
     {
         String output = openTag(ELEMENT.RADIO_EVALUATION.tag);
-        output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-        output += expectedAction;
-        output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        for (String str : expectedAction)
+        {
+            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+            output += str;
+            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        }
         output += closeTag(ELEMENT.RADIO_EVALUATION.tag);
         
Index: /trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java
===================================================================
--- /trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java	(revision 36)
+++ /trunk/src/scriptbuilder/structures/events/FacilitatorEvaluationEvent.java	(revision 37)
@@ -54,7 +54,10 @@
     {
         String output = openTag(ELEMENT.FACILITATOR_EVALUATION.tag);
-        output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-        output += expectedAction;
-        output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        for (String str : expectedAction)
+        {
+            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+            output += str;
+            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        }
         output += closeTag(ELEMENT.FACILITATOR_EVALUATION.tag);
         
Index: /trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java
===================================================================
--- /trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java	(revision 36)
+++ /trunk/src/scriptbuilder/structures/events/ATMSEvaluationEvent.java	(revision 37)
@@ -49,14 +49,17 @@
         expectedAction.remove(index);
     }
-    
+
     @Override
     public String toXML()
     {
         String output = openTag(ELEMENT.ATMS_EVALUATION.tag);
-        output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-        output += expectedAction;
-        output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        for (String str : expectedAction)
+        {
+            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+            output += str;
+            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        }
         output += closeTag(ELEMENT.ATMS_EVALUATION.tag);
-        
+
         return output;
     }
Index: /trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java
===================================================================
--- /trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java	(revision 36)
+++ /trunk/src/scriptbuilder/structures/events/CADEvaluationEvent.java	(revision 37)
@@ -54,7 +54,10 @@
     {
         String output = openTag(ELEMENT.CAD_EVALUATION.tag);
-        output += openTag(ELEMENT.EXPECTED_ACTION.tag);
-        output += expectedAction;
-        output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        for (String str : expectedAction)
+        {
+            output += openTag(ELEMENT.EXPECTED_ACTION.tag);
+            output += str;
+            output += closeTag(ELEMENT.EXPECTED_ACTION.tag);
+        }
         output += closeTag(ELEMENT.CAD_EVALUATION.tag);
         
Index: /trunk/src/scriptbuilder/structures/MyScriptHandler.java
===================================================================
--- /trunk/src/scriptbuilder/structures/MyScriptHandler.java	(revision 22)
+++ /trunk/src/scriptbuilder/structures/MyScriptHandler.java	(revision 37)
@@ -468,4 +468,6 @@
                     TMCTitle = "";
                 }
+                script.title = TMCTitle;
+                
             }
             else if (qName.equals(ELEMENT.TMT_RADIO.tag))
@@ -727,7 +729,7 @@
                     ((ParamicsEvent) newEvent).status = pcData.remove(ELEMENT.Status);
                 }
-                if (pcData.get(ELEMENT.Type) != null)
-                {
-                    ((ParamicsEvent) newEvent).type = pcData.remove(ELEMENT.Type);
+                if (pcData.get(ELEMENT.Incident_type) != null)
+                {
+                    ((ParamicsEvent) newEvent).type = pcData.remove(ELEMENT.Incident_type);
                 }
                 currInc.addNewEvent(newEvent, (int) currentEventTime);