diff --git a/Assets/Models/Units/Structures/Sample/sample.xml b/Assets/Models/Units/Structures/Sample/sample.xml
index 314d0e8..2c46046 100644
--- a/Assets/Models/Units/Structures/Sample/sample.xml
+++ b/Assets/Models/Units/Structures/Sample/sample.xml
@@ -1,4 +1,4 @@
-<model>
+<node name="sample">
   <node name="Cube">
     <mesh name="CubeCube" num_faces="20" num_vertex_groups="0" num_shape_keys="0">
       <vertdata px="1.0" py="1.0" pz="-1.0" nx="0.6891885995864868" ny="-0.22369249165058136" nz="0.6891884207725525" />
@@ -75,4 +75,4 @@
       <vert id="8" uvx="0.8577794432640076" uvy="0.5406141877174377" tx="0.0" ty="0.0" tz="-1.0" bx="-0.3594110310077667" by="0.9331793189048767" bz="-0.0" />
     </mesh>
   </node>
-</model>
\ No newline at end of file
+</node>
diff --git a/Assets/Models/Units/Vehicles/Battleships/battleship00.xml b/Assets/Models/Units/Vehicles/Battleships/battleship00.xml
index 9bf22f6..b173cf1 100644
--- a/Assets/Models/Units/Vehicles/Battleships/battleship00.xml
+++ b/Assets/Models/Units/Vehicles/Battleships/battleship00.xml
@@ -1,4 +1,4 @@
-<model>
+<node name="battleship">
   <node name="Plane">
     <mesh name="PlanePlane" num_faces="65476" num_vertex_groups="0" num_shape_keys="0">
       <vertdata px="0.9144665598869324" py="0.7586132287979126" pz="2.6615123748779297" nx="0.7972242832183838" ny="-0.5919244885444641" nz="-0.11856992542743683" />
@@ -246729,4 +246729,4 @@
       <vert id="50291" uvx="0.888769268989563" uvy="0.84847491979599" tx="0.6027916073799133" ty="0.632937490940094" tz="0.4858318865299225" bx="-0.33536654710769653" by="0.7534732818603516" bz="-0.5655152797698975" />
     </mesh>
   </node>
-</model>
\ No newline at end of file
+</node>
diff --git a/mapEditorAppState.cpp b/mapEditorAppState.cpp
index 1382a64..23402a9 100644
--- a/mapEditorAppState.cpp
+++ b/mapEditorAppState.cpp
@@ -72,7 +72,7 @@ namespace battleship{
 	}
 
 	void MapEditorAppState::MapEditor::pushLandmassVerts(float strength){
-		Mesh *mesh = map->getTerrainObject(0).node->getChild(0)->getMesh(0);
+		Mesh *mesh = map->getTerrainObject(0).node->getMesh(0);
 		MeshData meshData = mesh->getMeshBase();
 		MeshData::Vertex *verts = meshData.vertices;
 		int numVerts = meshData.numTris * 3;
@@ -136,12 +136,11 @@ namespace battleship{
 		mesh->construct();
 		mesh->setMaterial(mat);
 
-		Node *par = new Node(), *node = new Node();
+		Node *node = new Node();
 		node->attachMesh(mesh);
-		par->attachChild(node);
-		root->getRootNode()->attachChild(par);
+		root->getRootNode()->attachChild(node);
 
-		map->addTerrainObject(TerrainObject(Vector3(0, 0, 0), Vector3(size.x, 0, size.y), Vector3(14, 6, 14), TerrainObject::LANDMASS, par, 0, new Cell, new vb01::u32*));
+		map->addTerrainObject(TerrainObject(Vector3(0, 0, 0), Vector3(size.x, 0, size.y), Vector3(14, 6, 14), TerrainObject::LANDMASS, node, 0, new Cell, new vb01::u32*));
 	}
 
 	void MapEditorAppState::MapEditor::prepareGui(){
@@ -202,7 +201,7 @@ namespace battleship{
 					MapEditor *mapEditor = ((MapEditorAppState*)sm->getAppStateByType((int)AppStateType::MAP_EDITOR))->getMapEditor();
 
 					Map *map = Map::getSingleton();
-					Material *mat = map->getTerrainObject(0).node->getChild(0)->getMesh(0)->getMaterial();
+					Material *mat = map->getTerrainObject(0).node->getMesh(0)->getMaterial();
 					Material::BoolUniform *texturingUniform = (Material::BoolUniform*)mat->getUniform("texturingEnabled");
 					Texture *landTex = mapEditor->getLandmassTexture(selectedOption);
 					string texUni = "textures[0]";
diff --git a/unitFrameController.cpp b/unitFrameController.cpp
index 97268d7..65f5b6f 100644
--- a/unitFrameController.cpp
+++ b/unitFrameController.cpp
@@ -43,7 +43,7 @@ namespace battleship{
 	//TODO implement terrain evenness check
 	void UnitFrameController::update(){
 		Map *map = Map::getSingleton();
-		MeshData meshData = map->getTerrainObject(0).node->getChild(0)->getMesh(0)->getMeshBase();
+		MeshData meshData = map->getTerrainObject(0).node->getMesh(0)->getMeshBase();
 		MeshData::Vertex *verts = meshData.vertices;
 		int numVerts = 3 * meshData.numTris;