Index: /trunk/nbproject/project.properties
===================================================================
--- /trunk/nbproject/project.properties	(revision 17)
+++ /trunk/nbproject/project.properties	(revision 24)
@@ -60,6 +60,6 @@
 javac.classpath=\
     ${file.reference.junit-3.8.2.jar}:\
-    ${libs.swing-layout.classpath}:\
-    ${libs.Hamcrest.classpath}
+    ${libs.Hamcrest.classpath}:\
+    ${libs.swing-layout.classpath}
 annotation.processing.enabled.in.editor=false
 build.generated.sources.dir=${build.dir}/generated-sources
Index: /trunk/src/scriptbuilder/structures/ScriptIncident.java
===================================================================
--- /trunk/src/scriptbuilder/structures/ScriptIncident.java	(revision 12)
+++ /trunk/src/scriptbuilder/structures/ScriptIncident.java	(revision 24)
@@ -172,5 +172,5 @@
         {
             //System.out.println("Generating new slice at time " + start);
-            t = new TimeSlice(start);
+            t = new TimeSlice(start, this);
             t.addEvent(ev);
             slices.put(start, t);
Index: /trunk/src/scriptbuilder/structures/SimulationScript.java
===================================================================
--- /trunk/src/scriptbuilder/structures/SimulationScript.java	(revision 9)
+++ /trunk/src/scriptbuilder/structures/SimulationScript.java	(revision 24)
@@ -6,5 +6,4 @@
 import java.util.List;
 import java.util.Observable;
-import java.util.Observer;
 import java.util.Random;
 import java.util.Vector;