diff --git a/projects/blades-engine/source/data/FloorData.hx b/projects/blades-engine/source/data/FloorData.hx
index 6d6216aa..ee606133 100644
--- a/projects/blades-engine/source/data/FloorData.hx
+++ b/projects/blades-engine/source/data/FloorData.hx
@@ -33,7 +33,7 @@ class FloorData {
     
     public function clone():FloorData {
         var fd = new FloorData();
-        for (field in FloorData.getClassFields()) {
+        for (field in FloorData.getInstanceFields()) {
             fd.setField(field, this.field(field));
         }
         return fd;
diff --git a/projects/blades-engine/source/data/ScenData.hx b/projects/blades-engine/source/data/ScenData.hx
index 330a1690..c9dab6d1 100644
--- a/projects/blades-engine/source/data/ScenData.hx
+++ b/projects/blades-engine/source/data/ScenData.hx
@@ -49,19 +49,25 @@ class ScenData {
         var data:Dynamic = null;
         interp.variables["data"] = null;
 
+        function mapFor(type:String):Map<Int,Dynamic> {
+            return switch (type) {
+                case "floor":
+                    floorData;
+                case "terrain":
+                    terrainData;
+                default:
+                    null;
+            };
+        }
+
         function commitData() {
             data = interp.variables["data"];
             if (data == null) return;
             trace(data);
             
-            switch (defining) {
-                case "floor":
-                    floorData[id] = data;
-                case "terrain":
-                    terrainData[id] = data;
-                default:
-            }
+            mapFor(defining)[id] = data;
             data = data.clone();
+            interp.variables["data"] = data;
         }
         function clear(?type:String) {
             if (type == null) type = defining;
@@ -73,6 +79,7 @@ class ScenData {
                 default:
                     null;
             };
+            interp.variables["data"] = data;
         }
         function beginDefine(type, tid) {
             commitData();