diff --git a/AlgebraicDataflowArchitectureModel/.classpath b/AlgebraicDataflowArchitectureModel/.classpath
index 3e99697..3d939f1 100644
--- a/AlgebraicDataflowArchitectureModel/.classpath
+++ b/AlgebraicDataflowArchitectureModel/.classpath
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/GameEngine"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/jgraphx.jar"/>
+	<classpathentry kind="lib" path="C:/Users/Nitta/.m2/repository/org/joml/joml/1.10.7/joml-1.10.7.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/AlgebraicDataflowArchitectureModel/src/application/simulator/actions/ShowGameSimulatorAction.java b/AlgebraicDataflowArchitectureModel/src/application/simulator/actions/ShowGameSimulatorAction.java
index 97373e8..5a99f90 100644
--- a/AlgebraicDataflowArchitectureModel/src/application/simulator/actions/ShowGameSimulatorAction.java
+++ b/AlgebraicDataflowArchitectureModel/src/application/simulator/actions/ShowGameSimulatorAction.java
@@ -20,11 +20,10 @@
 
 	@Override
 	public void actionPerformed(ActionEvent e) {
-		Window window = Window.get();
 		Thread game = new Thread() {
 			@Override
 			public void run() {
-				window.init();
+				Window window = Window.get();
 				GameEnginePresenter presenter = new GameEnginePresenter(window.getScene(), simulator);
 				TimerService timerService = new TimerService(simulator);
 				window.run();
diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
index 3398f18..cfef320 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
@@ -194,8 +194,8 @@
 				}
 			}
 			if (!bReduced) return this;
-			Term newTerm = new Term(symbol, newChildren);
-			newTerm.setType(type);
+			Term newTerm = (Term) this.clone();
+			newTerm.children = newChildren;
 			return newTerm;
 		}
 	}
diff --git a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
index bb90111..0f5b6c6 100644
--- a/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
+++ b/AlgebraicDataflowArchitectureModel/src/simulator/Simulator.java
@@ -253,7 +253,7 @@
 							nextEvents.add(nextEvent);
 						}
 					}
-					if (invDependency.size() == 0) {
+					if (nextEvents.size() == 0) {
 						Event nextEvent = new Event(channel, inResPath, nextSystemState.getResource(inResId));
 						nextEvent.setMessage(nextEvent.updateDependingParameters(resourceStateValueProvider));
 						nextEvents.add(nextEvent);