diff --git a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
index 23d4564b9744dfcfb5fab69016bd9c4883ffd852..0a268c16448d569c4a2f6de9ddb62e7e2c0895ac 100644
--- a/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
+++ b/src/tec/letsgoing/ardublock/simulator/arduino/Arduino.java
@@ -142,7 +142,7 @@ public class Arduino {
 
 	public SimCodeFunction getFunction(String name) {
 		for (SimCodeFunction function : functions) {
-			if (function.getName() == name) {
+			if (function.getName().equals(name)) {
 				return function;
 			}
 
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java
index 86854d3e23dc9935b235fb6ecba10da231692979..de74e4f63ea3700662fc8644811451b9966fa060 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/control/CodeForCount.java
@@ -28,7 +28,7 @@ public class CodeForCount extends SimCode {
 		varname = _varname;
 		codeblocks = _blocks;
 	}
-
+	//TODO For/While Mit Vars ausrüsten
 	@Override
 	public SimCode run(Arduino _arduino, SimCodeFunction functionHead) {
 		// TODO delete Var after completion
diff --git a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java
index 82918ba600103d04a9fafb60500cbc5798fad98a..bf09c98654c3be39c138d48a92e5ee3106cecd2f 100644
--- a/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java
+++ b/src/tec/letsgoing/ardublock/simulator/simcode/vars/CodeBoolGet.java
@@ -24,6 +24,7 @@ public class CodeBoolGet extends SimCode {
 
 	@Override
 	public SimTypeBool run(Arduino _arduino, SimCodeFunction functionHead) {
+		//FIXME Für alle Get und Set müssen die oberligenenden "Stackschichten" berücksichtigt werden.
 		return (SimTypeBool) functionHead.readVariable(var.run(_arduino, functionHead).toString());
 	}