diff --git a/Assets/Models/Maps/111/111.lua b/Assets/Models/Maps/111/111.lua
index 07f8284..880fb39 100644
--- a/Assets/Models/Maps/111/111.lua
+++ b/Assets/Models/Maps/111/111.lua
@@ -1,4 +1,7 @@
 map = {
+	lights = {
+		{type = 3, color = {x = .9, y = .9, z = .9}},
+	},
 numWaterBodies = 1,
 size = {x = 123.000000, y = 100, z = 123.000000},
 impassibleNodeValue = 65535,
@@ -352,5 +355,5 @@ cells = {
 skybox = "Skybox1",
 terrain = {model = "111.xml", albedo = "111.jpg"},
 waterbodies = {
-{pos = {x = 7.296803, y = -0.948949, z = 6.370515},				size = {x = 42.873222, y = 42.948956}, albedo = "water.jpg"},}
+{pos = {x = 7.296803, y = -0.948949, z = 6.370515},				size = {x = 42.873222, y = 42.948956}, albedo = "water.png"},}
 }
diff --git a/Assets/Models/Maps/222/222.lua b/Assets/Models/Maps/222/222.lua
index 50da9ab..e2d8b3e 100644
--- a/Assets/Models/Maps/222/222.lua
+++ b/Assets/Models/Maps/222/222.lua
@@ -1,4 +1,7 @@
 map = {
+	lights = {
+		{type = 3, color = {x = .9, y = .9, z = .9}},
+	},
 numWaterBodies = 0,
 size = {x = 123.000000, y = 100, z = 123.000000},
 impassibleNodeValue = 65535,
diff --git a/Assets/Models/Maps/water/water.lua b/Assets/Models/Maps/water/water.lua
index c8dce7a..9538429 100644
--- a/Assets/Models/Maps/water/water.lua
+++ b/Assets/Models/Maps/water/water.lua
@@ -1,4 +1,7 @@
 map = {
+	lights = {
+		{type = 3, color = {x = .9, y = .9, z = .9}},
+	},
 numWaterBodies = 1,
 size = {x = 1000.000000, y = 100, z = 1000.000000},
 impassibleNodeValue = 65535,
@@ -11,7 +14,8 @@ players = {
 resourceDeposits = {
 },
 units = {
-	{id = UnitId.TANK, pos = {x = -300.000000, y = 0.000000, z = -50.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+	{id = UnitId.TANK, pos = {x = 300.000000, y = 0.000000, z = 0.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+	{id = UnitId.LAB, pos = {x = 300.000000, y = 0.000000, z = 100.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}, buildStatus = 100},
 	--{id = UnitId.ENGINEER, pos = {x = -10.000000, y = 0.000000, z = -10.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
 	--{id = UnitId.POINT_DEFENSE, pos = {x = 0.000000, y = 0.000000, z = 0.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
 }
@@ -19,21 +23,21 @@ units = {
 {
 	resourceDeposits = {},
 	units = {
-		{id = UnitId.WAR_MECH, pos = {x = 300.000000, y = 0.000000, z = 12.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.TANK, pos = {x = 400.000000, y = 0.000000, z = 0.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.POINT_DEFENSE, pos = {x = 400.000000, y = 0.000000, z = 20.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}, buildStatus = 100},
-		{id = UnitId.SCOUT_TRANSPORT, pos = {x = 400.000000, y = 0.000000, z = 0.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		{id = UnitId.WAR_MECH, pos = {x = 300.000000, y = 0.000000, z = 220.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.TANK, pos = {x = 400.000000, y = 0.000000, z = 0.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.POINT_DEFENSE, pos = {x = 400.000000, y = 0.000000, z = 20.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}, buildStatus = 100},
+		--{id = UnitId.SCOUT_TRANSPORT, pos = {x = 400.000000, y = 0.000000, z = 0.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
 		{id = UnitId.ENGINEER, pos = {x = 450.000000, y = 0.000000, z = 0.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.TACTICAL_CRUISER, pos = {x = -60.000000, y = 0.000000, z = -80.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.CHEAP_CRUISER, pos = {x = -60.000000, y = 0.000000, z = -30.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.DEFENSIVE_CRUISER, pos = {x = -60.00000, y = 0.000000, z = 20.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.TRANSPORT_CRUISER, pos = {x = -60.00000, y = 0.000000, z = 60.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.CHAMPION_CARRIER, pos = {x = -80.00000, y = 0.000000, z = -80.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.HEAVY_CARRIER, pos = {x = 0.00000, y = 0.000000, z = -80.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.SCOUT_TRANSPORT, pos = {x = 30.00000, y = 0.000000, z = -80.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.HOVER_TRANSPORT, pos = {x = 60.00000, y = 0.000000, z = -80.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.MISSILE_SUBMARINE, pos = {x = -40.00000, y = 0.000000, z = -50.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
-		{id = UnitId.STEALTH_SUBMARINE, pos = {x = -40.00000, y = 0.000000, z = 20.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.TACTICAL_CRUISER, pos = {x = -60.000000, y = 0.000000, z = -80.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.CHEAP_CRUISER, pos = {x = -60.000000, y = 0.000000, z = -30.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.DEFENSIVE_CRUISER, pos = {x = -60.00000, y = 0.000000, z = 20.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.TRANSPORT_CRUISER, pos = {x = -60.00000, y = 0.000000, z = 60.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.CHAMPION_CARRIER, pos = {x = -80.00000, y = 0.000000, z = -80.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.HEAVY_CARRIER, pos = {x = 0.00000, y = 0.000000, z = -80.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.SCOUT_TRANSPORT, pos = {x = 30.00000, y = 0.000000, z = -80.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.HOVER_TRANSPORT, pos = {x = 60.00000, y = 0.000000, z = -80.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.MISSILE_SUBMARINE, pos = {x = -40.00000, y = 0.000000, z = -50.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
+		--{id = UnitId.STEALTH_SUBMARINE, pos = {x = -40.00000, y = 0.000000, z = 20.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}},
 		--{id = UnitId.EXTRACTOR, pos = {x = 30.000000, y = 0.000000, z = 0.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}, buildStatus = 100},
 		--{id = UnitId.LAB, pos = {x = 50.000000, y = 0.000000, z = 0.000000}, rot = {w = 1.000000, x = 0.000000, y = 0.000000, z = 0.000000}, buildStatus = 100},
 	}
diff --git a/mapEditorAppState.cpp b/mapEditorAppState.cpp
index 9f8d642..1fba0f7 100644
--- a/mapEditorAppState.cpp
+++ b/mapEditorAppState.cpp
@@ -398,7 +398,7 @@ namespace battleship{
 		string mapScript = "map = {\nlights = {\n";
 
 		for(Node *light : map->getLights()){
-			mapScript += "{type = " + to_string((int)light->getLight(0)->getType());
+			mapScript += "{type = " + to_string((int)light->getLight(0)->getLightType());
 
 			if(light->getLight(0)->getLightType() == Light::Type::DIRECTIONAL){
 				Vector3 dir = light->getGlobalAxis(2);