diff --git a/planet/Missions.ocf/TreasureHunt.ocs/MapBg.bmp b/planet/Missions.ocf/TreasureHunt.ocs/MapBg.bmp
index 6b82290b6..fb186818b 100644
Binary files a/planet/Missions.ocf/TreasureHunt.ocs/MapBg.bmp and b/planet/Missions.ocf/TreasureHunt.ocs/MapBg.bmp differ
diff --git a/planet/Missions.ocf/TreasureHunt.ocs/MapFg.bmp b/planet/Missions.ocf/TreasureHunt.ocs/MapFg.bmp
index 21c163e9a..b3c2e4bf5 100644
Binary files a/planet/Missions.ocf/TreasureHunt.ocs/MapFg.bmp and b/planet/Missions.ocf/TreasureHunt.ocs/MapFg.bmp differ
diff --git a/planet/Missions.ocf/TreasureHunt.ocs/Objects.c b/planet/Missions.ocf/TreasureHunt.ocs/Objects.c
index d73485ced..0463dcac0 100644
--- a/planet/Missions.ocf/TreasureHunt.ocs/Objects.c
+++ b/planet/Missions.ocf/TreasureHunt.ocs/Objects.c
@@ -1,40 +1,54 @@
 /* Automatically created objects file */
 
-static g_flagpole, g_golden_idol, npc_dagobert, npc_tarzan, g_golden_shovel, g_last_stone_door;
+static g_last_stone_door, g_flagpole, g_golden_idol, npc_dagobert, npc_tarzan, g_golden_shovel;
 
 func InitializeObjects()
 {
-	CreateObjectAbove(Grass, 1627, 396);
-	CreateObjectAbove(Grass, 1636, 385);
-	CreateObjectAbove(Grass, 1786, 469);
-	CreateObjectAbove(Grass, 1574, 493);
-	CreateObjectAbove(Grass, 1564, 493);
-	CreateObjectAbove(Grass, 1537, 525);
-	CreateObjectAbove(Grass, 1585, 486);
-	CreateObjectAbove(Grass, 1739, 430);
+	var Grass001 = CreateObjectAbove(Grass, 1627, 396);
+	var Grass002 = CreateObjectAbove(Grass, 1636, 385);
+	var Grass003 = CreateObjectAbove(Grass, 1786, 469);
+	var Grass004 = CreateObjectAbove(Grass, 1574, 493);
+	var Grass005 = CreateObjectAbove(Grass, 1564, 493);
+	var Grass006 = CreateObjectAbove(Grass, 1537, 525);
+	var Grass007 = CreateObjectAbove(Grass, 1585, 486);
+	var Grass008 = CreateObject(Grass, 1739, 429);
+	Grass008->SetPosition(1739, 429);
 
-	var Torch001 = CreateObjectAbove(Torch, 1201, 1549);
+	var Torch001 = CreateObjectAbove(Torch, 562, 1126);
 	Torch001->AttachToWall(true);
-	var Torch002 = CreateObjectAbove(Torch, 1109, 1146);
+	Torch001->SetMeshMaterial("Torch", 0);
+	Torch001->SetState(3);
+	var Torch002 = CreateObjectAbove(Torch, 1869, 1454);
 	Torch002->AttachToWall(true);
+	Torch002->SetMeshMaterial("Torch", 0);
+	Torch002->SetState(3);
 	var Torch003 = CreateObjectAbove(Torch, 923, 1144);
 	Torch003->AttachToWall(true);
-	var Torch004 = CreateObjectAbove(Torch, 1869, 1454);
+	Torch003->SetMeshMaterial("Torch", 0);
+	Torch003->SetState(3);
+	var Torch004 = CreateObjectAbove(Torch, 1109, 1146);
 	Torch004->AttachToWall(true);
-	var Torch005 = CreateObjectAbove(Torch, 562, 1126);
+	Torch004->SetMeshMaterial("Torch", 0);
+	Torch004->SetState(3);
+	var Torch005 = CreateObjectAbove(Torch, 1201, 1549);
 	Torch005->AttachToWall(true);
-
-	var Chest001 = CreateObject(Chest, 1002, 302);
-	Chest001.Plane = 50;
+	Torch005->SetMeshMaterial("Torch", 0);
+	Torch005->SetState(3);
 
 	var Column001 = CreateObjectAbove(Column, 779, 591);
 	Column001->SetClrModulation(0xffffd0d0);
 	Column001->SetMeshMaterial("AncientColumn", 0);
 	Column001.Plane = 50;
 
-	CreateObject(Rule_TeamAccount);
+	var Chest001 = CreateObject(Chest, 1002, 302);
+	Chest001.Plane = 50;
+	Chest001->SetPosition(1002, 302);
 
-	CreateObject(Rule_NoPowerNeed);
+	var Rule_TeamAccount001 = CreateObject(Rule_TeamAccount);
+	Rule_TeamAccount001->SetPosition(0, 0);
+
+	var Rule_NoPowerNeed001 = CreateObject(Rule_NoPowerNeed);
+	Rule_NoPowerNeed001->SetPosition(0, 0);
 
 	var LargeCaveMushroom001 = CreateObjectAbove(LargeCaveMushroom, 1308, 1038);
 	LargeCaveMushroom001->SetClrModulation(0xffe4effc);
@@ -63,7 +77,8 @@ func InitializeObjects()
 	CreateObjectAbove(EnvPack_Bag, 506, 968);
 
 	CreateObjectAbove(EnvPack_Lantern, 356, 458);
-	CreateObject(EnvPack_TreeTrunks, 601, 408);
+	var EnvPack_TreeTrunks001 = CreateObject(EnvPack_TreeTrunks, 601, 408);
+	EnvPack_TreeTrunks001->SetPosition(601, 408);
 
 	CreateObjectAbove(EnvPack_Rail, 564, 354);
 	CreateObjectAbove(EnvPack_Rail, 616, 356);
@@ -80,22 +95,31 @@ func InitializeObjects()
 
 	var Branch001 = CreateObject(Branch, 1320, 329);
 	Branch001->SetR(148);
+	Branch001->SetPosition(1320, 329);
 	var Branch002 = CreateObject(Branch, 1327, 291);
 	Branch002->SetR(165);
+	Branch002->SetPosition(1327, 291);
 	var Branch003 = CreateObject(Branch, 1424, 260);
 	Branch003->SetR(108);
+	Branch003->SetPosition(1424, 260);
 	var Branch004 = CreateObject(Branch, 1430, 240);
 	Branch004->SetR(39);
+	Branch004->SetPosition(1430, 240);
 	var Branch005 = CreateObject(Branch, 1413, 265);
 	Branch005->SetR(128);
+	Branch005->SetPosition(1413, 265);
 	var Branch006 = CreateObject(Branch, 1396, 266);
 	Branch006->SetR(-131);
+	Branch006->SetPosition(1396, 266);
 
 	CreateObjectAbove(SproutBerryBush, 1823, 493);
 
 	CreateObjectAbove(Trunk, 401, 1147);
 
-	CreateObjectAbove(Tree_Coconut, 51, 1142);
+	var Tree_Coconut001 = CreateObject(Tree_Coconut, 38, 1140);
+	Tree_Coconut001->SetCon(98);
+	Tree_Coconut001->SetR(12);
+	Tree_Coconut001->SetPosition(38, 1140);
 	CreateObjectAbove(Tree_Coconut, 333, 1150);
 
 	CreateObjectAbove(Tree_Coniferous, 1864, 464);
@@ -104,11 +128,14 @@ func InitializeObjects()
 	var Lichen001 = CreateObjectAbove(Lichen, 2694, 706);
 	Lichen001->SetAction("Grown");
 
-	CreateObject(BigRock, 1301, 497);
+	var BigRock001 = CreateObject(BigRock, 1301, 497);
+	BigRock001->SetPosition(1301, 497);
 	CreateObjectAbove(BigRock, 1207, 282);
-	CreateObject(BigRock, 1291, 260);
+	var BigRock002 = CreateObject(BigRock, 1291, 260);
+	BigRock002->SetPosition(1291, 260);
 	var Amethyst001 = CreateObject(Amethyst, 803, 579);
 	Amethyst001.Plane = 190;
+	Amethyst001->SetPosition(803, 579);
 
 	var Chest002 = CreateObjectAbove(Chest, 515, 967);
 	Chest002.tool_spawn = TeleGlove;
@@ -152,392 +179,62 @@ func InitializeObjects()
 	var Idol001 = CreateObjectAbove(Idol, 1045, 721);
 	Idol001->SetMeshMaterial("IdolGrayColor", 0);
 
-	g_flagpole = CreateObject(Flagpole, 210, 1151);
-	g_flagpole.StaticSaveVar = "g_flagpole";
-	g_flagpole->SetName("Respawn");
-	g_flagpole->SetNeutral(true);
-
-	var LotsOfCoins001 = CreateObject(LotsOfCoins, 805, 583);
-	LotsOfCoins001.Plane = 200;
-
-	g_golden_idol = CreateObject(Idol, 824, 568);
-	g_golden_idol->SetR(-4);
-	g_golden_idol.Plane = 220;
-	g_golden_idol.StaticSaveVar = "g_golden_idol";
-
-	var Lorry002 = CreateObjectAbove(Lorry, 200, 1183);
-	var Lorry001 = CreateObjectAbove(Lorry, 708, 1407);
-	Lorry001->SetMeshMaterial("RuinedLorry", 0);
-
-	var Catapult001 = CreateObjectAbove(Catapult, 1714, 951);
-	Catapult001->SetRDir(-7);
-
-	CreateObjectAbove(StrawMan, 1924, 439);
-	CreateObjectAbove(StrawMan, 2642, 705);
-	var Clonk001 = CreateObjectAbove(Clonk, 316, 431);
-	Clonk001->SetName("$Guard$");
-	AI->AddAI(Clonk001);
-	AI->SetHome(Clonk001, 315, 422, DIR_Left);
-	AI->SetGuardRange(Clonk001, 296, 322, 350, 140);
-	AI->SetEncounterCB(Clonk001, "EncounterCastle");
-	Clonk001->SetDir(DIR_Left);
-	
-	var Clonk002 = CreateObjectAbove(Clonk, 501, 454);
-	Clonk002->SetDir(DIR_Right);
-	Clonk002->SetName("$Guard$");
-	AI->AddAI(Clonk002);
-	AI->SetHome(Clonk002, 502, 445, DIR_Right);
-	AI->SetGuardRange(Clonk002, 460, 300, 200, 160);
-	AI->SetMaxAggroDistance(Clonk002, 60);
-	
-	var Clonk003 = CreateObjectAbove(Clonk, 534, 455);
-	Clonk003->SetName("$Guard$");
-	Clonk003->SetDir(DIR_Right);
-	AI->AddAI(Clonk003);
-	AI->SetGuardRange(Clonk003, 460, 300, 200, 160);
-	AI->SetMaxAggroDistance(Clonk003, 60);
-	
-	var Clonk004 = CreateObjectAbove(Clonk, 671, 638);
-	Clonk004->SetName("$TreasureHunter$");
-	Clonk004->SetDir(DIR_Right);
-	Clonk004->SetCon(150);
-	Clonk004->SetColor(0xffffa000);
-	AI->AddAI(Clonk004);
-	AI->SetHome(Clonk004, 671, 629, DIR_Right);
-	AI->SetGuardRange(Clonk004, 580, 480, 320, 175);
-	AI->SetEncounterCB(Clonk004, "EncounterFinal");
-	
-	npc_dagobert = CreateObjectAbove(Clonk, 369, 1142);
-	npc_dagobert->SetColor(0xffa000);
-	npc_dagobert->SetName("Dagobert");
-	npc_dagobert.StaticSaveVar = "npc_dagobert";
-	npc_dagobert->MakeInvincible();
-	npc_dagobert->SetDir(DIR_Left);
-	var Clonk005 = CreateObjectAbove(Clonk, 1720, 375);
-	Clonk005->SetDir(DIR_Right);
-	Clonk005->SetColor(0x808080);
-	Clonk005->SetName("Otto");
-	Clonk005->MakeInvincible();
-	Clonk005->SetSkin(2);
-	var Clonk006 = CreateObjectAbove(Clonk, 1868, 951);
-	Clonk006->SetColor(0xff0000);
-	Clonk006->SetName("Donald");
-	Clonk006->MakeInvincible();
-	Clonk006->SetDir(DIR_Left);
-	var Clonk007 = CreateObjectAbove(Clonk, 676, 943);
-	Clonk007->SetDir(DIR_Right);
-	Clonk007->SetColor(0x802000);
-	Clonk007->SetName("Jane");
-	Clonk007->SetSkin(1);
-	Clonk007->MakeInvincible();
-	npc_tarzan = CreateObjectAbove(Clonk, 750, 859);
-	npc_tarzan->SetXDir(3);
-	npc_tarzan->SetYDir(27);
-	npc_tarzan->SetColor(0x402000);
-	npc_tarzan->SetName("Tarzan");
-	npc_tarzan.StaticSaveVar = "npc_tarzan";
-	npc_tarzan->SetDir(DIR_Left);
-	var Clonk008 = CreateObjectAbove(Clonk, 498, 966);
-	Clonk008->SetColor(0x20ffff);
-	Clonk008->SetName("Sophie");
-	Clonk008->SetSkin(3);
-	Clonk008->MakeInvincible();
-	Clonk008->SetDir(DIR_Left);
-	var Clonk009 = CreateObjectAbove(Clonk, 853, 734);
-	Clonk009->SetDir(DIR_Right);
-	Clonk009->SetColor(0x6000);
-	Clonk009->SetName("Riku");
-	Clonk009->SetSkin(2);
-	var Clonk010 = CreateObjectAbove(Clonk, 1098, 1151);
-	Clonk010->SetDir(DIR_Right);
-	Clonk010->SetColor(0x800000);
-	Clonk010->SetName("Ann");
-	Clonk010->SetSkin(3);
-	Clonk010->MakeInvincible();
-	var Pickaxe001 = Clonk010->CreateContents(Pickaxe);
-
-	Clonk010->SetDialogue("Ann",true);
-	Clonk009->SetDialogue("Riku",true);
-
-	var TeleGlove001 = Clonk008->CreateContents(TeleGlove);
-
-	Clonk008->SetDialogue("Sophie",true);
-	Clonk006->SetDialogue("Donald",true);
-	Clonk007->SetDialogue("Jane",true);
-
-	var GrappleBow001 = npc_tarzan->CreateContents(GrappleBow);
-	var GrappleBow002 = npc_tarzan->CreateContents(GrappleBow);
-
-	npc_tarzan->SetDialogue("Tarzan",false);
-	Clonk005->SetDialogue("Otto",true);
-	npc_dagobert->SetDialogue("Dagobert",true);
-
-	CreateObjectAbove(Skull, 53, 1138);
-
-	var Bone001 = CreateObject(Bone, 25, 1139);
-	Bone001->SetR(-65);
-	var Bone002 = CreateObject(Bone, 48, 1135);
-	Bone002->SetR(-51);
-	var Bone003 = CreateObject(Bone, 472, 966);
-	Bone003->SetR(-41);
-	Bone003->SetRDir(11);
-	var Bone004 = CreateObject(Bone, 488, 964);
-	Bone004->SetR(-51);
-	Bone004->SetYDir(8);
-	var Bone005 = CreateObject(Bone, 479, 964);
-	Bone005->SetR(-51);
-	var Bone006 = CreateObject(Bone, 464, 965);
-	Bone006->SetR(-51);
-
-	Lorry002->CreateContents(Loam, 4);
-	CreateObject(Loam, 153, 1232);
-	CreateObject(Loam, 357, 1317);
-	CreateObject(Loam, 265, 1451);
-	CreateObject(Loam, 528, 1450);
-	CreateObject(Loam, 554, 1453);
-	CreateObject(Loam, 988, 1284);
-	CreateObject(Loam, 1030, 1272);
-	CreateObject(Loam, 1065, 1267);
-	CreateObject(Loam, 1051, 1258);
-	CreateObject(Loam, 1049, 1279);
-	CreateObject(Loam, 1081, 1266);
-	CreateObject(Loam, 1334, 1049);
-	CreateObject(Loam, 1532, 858);
-	CreateObject(Loam, 1619, 804);
-	CreateObject(Loam, 1642, 439);
-	CreateObject(Loam, 1694, 399);
-	CreateObject(Loam, 1578, 524);
-	CreateObject(Loam, 1746, 456);
-
-	var Metal001 = CreateObject(Metal, 1922, 976);
-	Metal001->SetR(20);
-
-	var Nugget001 = CreateObject(Nugget, 812, 589);
-	Nugget001->SetClrModulation(0xffffd0a0);
-	CreateObject(Nugget, 869, 582);
-	var Nugget002 = CreateObject(Nugget, 853, 583);
-	Nugget002->SetClrModulation(0xffffd0a0);
-	var Nugget003 = CreateObject(Nugget, 823, 583);
-	Nugget003->SetClrModulation(0xffffd0a0);
-
-	Chest010->CreateContents(GoldBar);
-	Chest011->CreateContents(GoldBar);
-	Chest012->CreateContents(GoldBar);
-	Chest013->CreateContents(GoldBar);
-	Lorry001->CreateContents(GoldBar);
-	Chest006->CreateContents(GoldBar);
-	Chest014->CreateContents(GoldBar);
-	Chest015->CreateContents(GoldBar);
-	Chest016->CreateContents(GoldBar);
-	Chest001->CreateContents(GoldBar);
-	Chest017->CreateContents(GoldBar);
-	Chest018->CreateContents(GoldBar);
-	var GoldBar001 = Chest019->CreateContents(GoldBar);
-	GoldBar001->SetClrModulation(0xffffd0a0);
-	var GoldBar002 = CreateObject(GoldBar, 880, 540);
-	GoldBar002->SetR(-29);
-	GoldBar002->SetClrModulation(0xffffd0a0);
-	ToolsWorkshop001->CreateContents(GoldBar);
-	CreateObject(GoldBar, 72, 1463);
-	CreateObject(GoldBar, 2746, 736);
-	CreateObjectAbove(GoldBar, 2507, 1262);
-	Chest020->CreateContents(GoldBar);
-	var GoldBar003 = CreateObject(GoldBar, 972, 1277);
-	GoldBar003->SetR(55);
-
-	CreateObject(Ruby, 864, 581);
-	CreateObject(Ruby, 806, 583);
-	CreateObject(Ruby, 849, 578);
-	CreateObject(Ruby, 856, 584);
-
-	var Amethyst002 = CreateObject(Amethyst, 793, 584);
-	Amethyst002->SetR(22);
-	CreateObject(Amethyst, 885, 557);
-	CreateObjectAbove(Amethyst, 828, 585);
-
-	Lorry002->CreateContents(Dynamite, 2);
-	Chest006->CreateContents(Dynamite, 3);
-	CreateObjectAbove(Dynamite, 790, 736);
-	Chest005->CreateContents(Dynamite, 2);
-	Chest004->CreateContents(Dynamite, 2);
-	Chest002->CreateContents(Dynamite);
-	Chest012->CreateContents(Dynamite, 3);
-	Chest014->CreateContents(Dynamite, 3);
-
-	var Bow001 = Clonk001->CreateContents(Bow);
-	Chest003->CreateContents(Bow);
-
-	Bow001->CreateContents(Arrow);
-	Clonk001->CreateContents(Arrow);
-	var Arrow001 = CreateObject(Arrow, 313, 431);
-	Arrow001->SetR(90);
-	var Arrow002 = CreateObject(Arrow, 313, 431);
-	Arrow002->SetR(90);
-	var Arrow003 = CreateObject(Arrow, 313, 431);
-	Arrow003->SetR(90);
-	var Arrow004 = CreateObject(Arrow, 313, 431);
-	Arrow004->SetR(90);
-	var Arrow005 = CreateObject(Arrow, 313, 431);
-	Arrow005->SetR(90);
-	var Arrow006 = CreateObject(Arrow, 313, 431);
-	Arrow006->SetR(90);
-	var Arrow007 = CreateObject(Arrow, 313, 431);
-	Arrow007->SetR(90);
-	var Arrow008 = CreateObject(Arrow, 313, 431);
-	Arrow008->SetR(90);
-	var Arrow009 = CreateObject(Arrow, 313, 431);
-	Arrow009->SetR(90);
-	Chest003->CreateContents(Arrow);
-
-	Chest021->CreateContents(Bread, 2);
-	Lorry001->CreateContents(Bread, 3);
-	Chest004->CreateContents(Bread);
-	Chest017->CreateContents(Bread);
-	Chest009->CreateContents(Bread);
-	ToolsWorkshop001->CreateContents(Bread);
-	Chest011->CreateContents(Bread);
-	Chest012->CreateContents(Bread);
-	Chest018->CreateContents(Bread);
-	Chest007->CreateContents(Bread);
-	Chest002->CreateContents(Bread);
-
-	Chest021->CreateContents(DynamiteBox, 2);
-	Chest017->CreateContents(DynamiteBox, 2);
-	Chest020->CreateContents(DynamiteBox);
-	Chest015->CreateContents(DynamiteBox);
-	Chest019->CreateContents(DynamiteBox);
-
-	Clonk003->CreateContents(Sword);
-	Clonk002->CreateContents(Sword);
-	Chest006->CreateContents(Sword);
-	Clonk004->CreateContents(Sword, 2);
-	Lorry001->CreateContents(Sword);
-	Chest003->CreateContents(Sword);
-
-	CreateObjectAbove(Seaweed, 2494, 1263);
-	CreateObjectAbove(Seaweed, 2508, 1263);
-	CreateObjectAbove(Seaweed, 2520, 1263);
-	CreateObjectAbove(Seaweed, 2508, 1263);
-	CreateObjectAbove(Seaweed, 2503, 1263);
-	CreateObjectAbove(Seaweed, 2526, 1262);
-	CreateObjectAbove(Seaweed, 2516, 1263);
-	CreateObjectAbove(Seaweed, 2499, 1263);
-	CreateObjectAbove(Seaweed, 2663, 1278);
-	CreateObjectAbove(Seaweed, 2769, 1272);
-	CreateObjectAbove(Seaweed, 2751, 1279);
-	CreateObjectAbove(Seaweed, 2762, 1271);
-	CreateObjectAbove(Seaweed, 2775, 1279);
-	CreateObjectAbove(Seaweed, 2762, 1271);
-	CreateObjectAbove(Seaweed, 2659, 1279);
-	CreateObjectAbove(Seaweed, 2416, 1245);
-	CreateObjectAbove(Seaweed, 2395, 1239);
-	CreateObjectAbove(Seaweed, 2396, 1239);
-	CreateObjectAbove(Seaweed, 2332, 1145);
-	CreateObject(Seaweed, 2407, 1239);
-
-	CreateObjectAbove(Mushroom, 1580, 758);
-	CreateObjectAbove(Mushroom, 1613, 776);
-	CreateObjectAbove(Mushroom, 1525, 847);
-	CreateObjectAbove(Mushroom, 1612, 864);
-	CreateObjectAbove(Mushroom, 1321, 895);
-	CreateObjectAbove(Mushroom, 1315, 895);
-	CreateObjectAbove(Mushroom, 1343, 902);
-	CreateObjectAbove(Mushroom, 1347, 903);
-
-	CreateObjectAbove(Balloon, 491, 383);
-
-	var Barrel001 = CreateObjectAbove(Barrel, 623, 456);
-	Barrel001->SetColor(0xff000000);
-
-	CreateObjectAbove(Sproutberry, 1823, 488);
-	CreateObjectAbove(Sproutberry, 1823, 488);
-	CreateObjectAbove(Sproutberry, 1823, 488);
-
-	CreateObjectAbove(Boompack, 543, 383);
-	CreateObjectAbove(Boompack, 548, 384);
-	CreateObjectAbove(Boompack, 1948, 713);
-	var Boompack001 = CreateObject(Boompack, 1944, 483);
-	Boompack001->SetR(135);
-
-	g_golden_shovel = CreateObjectAbove(Shovel, 1841, 1011);
-	g_golden_shovel->SetMeshMaterial("GoldenShovel", 0);
-	g_golden_shovel.StaticSaveVar = "g_golden_shovel";
-
-	CreateObject(Pipe, 1838, 1013);
-
-	var LotsOfCoins002 = CreateObject(LotsOfCoins, 838, 583);
-	LotsOfCoins002.Plane = 500;
-
-	var GemOfPower001 = CreateObjectAbove(GemOfPower, 825, 572);
-	GemOfPower001->SetCategory(C4D_StaticBack);
-
-	CreateObjectAbove(Firestone, 564, 1136);
-	CreateObjectAbove(Firestone, 552, 1136);
-	CreateObjectAbove(Firestone, 562, 1136);
-	CreateObjectAbove(Firestone, 571, 1136);
-	CreateObjectAbove(Firestone, 567, 1136);
-	CreateObject(Firestone, 558, 1135);
-	CreateObject(Firestone, 546, 1135);
-	CreateObjectAbove(Firestone, 560, 1136);
-	CreateObject(Firestone, 546, 1135);
-	CreateObject(Firestone, 546, 1135);
-	CreateObject(Firestone, 555, 1135);
-	CreateObjectAbove(Firestone, 562, 1136);
-	CreateObject(Firestone, 550, 1135);
-	CreateObjectAbove(Firestone, 552, 1136);
-	CreateObject(Firestone, 342, 1224);
-	CreateObject(Firestone, 166, 1260);
-	CreateObject(Firestone, 234, 1423);
-	CreateObjectAbove(Firestone, 315, 431);
-	CreateObject(Firestone, 1359, 1060);
-	CreateObject(Firestone, 1348, 1041);
-	CreateObject(Firestone, 1384, 1054);
-	CreateObject(Firestone, 1417, 1106);
-	CreateObject(Firestone, 1432, 1112);
-	CreateObject(Firestone, 1436, 1103);
-	CreateObject(Firestone, 1340, 919);
-	CreateObject(Firestone, 1476, 875);
-	CreateObject(Firestone, 1549, 865);
-	CreateObject(Firestone, 1607, 791);
-	CreateObject(Firestone, 2053, 851);
-	CreateObject(Firestone, 2161, 942);
-	CreateObject(Firestone, 2073, 861);
-	CreateObject(Firestone, 2064, 851);
-
 	var StoneDoor001 = CreateObject(StoneDoor, 940, 1132);
 	StoneDoor001->SetComDir(COMD_Down);
 	StoneDoor001->MakeInvincible();
+	StoneDoor001->SetPosition(940, 1132);
+	StoneDoor001->SetPlrViewOnSignalChange(true);
 	var StoneDoor002 = CreateObject(StoneDoor, 1084, 1132);
 	StoneDoor002->SetComDir(COMD_Down);
 	StoneDoor002->MakeInvincible();
+	StoneDoor002->SetPosition(1084, 1132);
+	StoneDoor002->SetPlrViewOnSignalChange(true);
 	var StoneDoor003 = CreateObject(StoneDoor, 564, 436);
 	StoneDoor003->SetComDir(COMD_Down);
 	StoneDoor003->MakeInvincible();
+	StoneDoor003->SetPosition(564, 436);
+	StoneDoor003->SetPlrViewOnSignalChange(true);
 	var StoneDoor004 = CreateObject(StoneDoor, 843, 716);
 	StoneDoor004->SetComDir(COMD_Down);
 	StoneDoor004->MakeInvincible();
+	StoneDoor004->SetPosition(843, 716);
+	StoneDoor004->SetPlrViewOnSignalChange(true);
 	var StoneDoor005 = CreateObject(StoneDoor, 1058, 700);
 	StoneDoor005->SetComDir(COMD_Down);
 	StoneDoor005->MakeInvincible();
+	StoneDoor005->SetPosition(1058, 700);
+	StoneDoor005->SetPlrViewOnSignalChange(true);
 	var StoneDoor006 = CreateObject(StoneDoor, 1092, 1028);
 	StoneDoor006->SetComDir(COMD_Down);
 	StoneDoor006->MakeInvincible();
+	StoneDoor006->SetPosition(1092, 1028);
+	StoneDoor006->SetPlrViewOnSignalChange(true);
 	var StoneDoor007 = CreateObject(StoneDoor, 1892, 932);
 	StoneDoor007->SetComDir(COMD_Down);
 	StoneDoor007->MakeInvincible();
+	StoneDoor007->SetPosition(1892, 932);
+	StoneDoor007->SetPlrViewOnSignalChange(true);
 	var StoneDoor008 = CreateObject(StoneDoor, 813, 716);
 	StoneDoor008->SetComDir(COMD_Down);
 	StoneDoor008->MakeInvincible();
+	StoneDoor008->SetPosition(813, 716);
+	StoneDoor008->SetPlrViewOnSignalChange(true);
 	g_last_stone_door = CreateObject(StoneDoor, 781, 716);
 	g_last_stone_door->SetComDir(COMD_Down);
 	g_last_stone_door->SetClrModulation(0xffa0a0a0);
 	g_last_stone_door.StaticSaveVar = "g_last_stone_door";
+	g_last_stone_door->SetPosition(781, 716);
+	g_last_stone_door->SetPlrViewOnSignalChange(true);
 	var StoneDoor009 = CreateObject(StoneDoor, 692, 748);
 	StoneDoor009->SetComDir(COMD_Down);
 	StoneDoor009->MakeInvincible();
+	StoneDoor009->SetPosition(692, 748);
+	StoneDoor009->SetPlrViewOnSignalChange(true);
 	var StoneDoor010 = CreateObject(StoneDoor, 684, 332);
 	StoneDoor010->SetComDir(COMD_Down);
 	StoneDoor010->MakeInvincible();
+	StoneDoor010->SetPosition(684, 332);
+	StoneDoor010->SetPlrViewOnSignalChange(true);
 
 	var SpinWheel001 = CreateObjectAbove(SpinWheel, 589, 457);
 	SpinWheel001->SetMeshMaterial("SpinWheelGearRed", 0);
@@ -549,6 +246,7 @@ func InitializeObjects()
 	SpinWheel003->SetMeshMaterial("SpinWheelBaseAlt", 1);
 	SpinWheel003->SetSwitchTarget(StoneDoor003);
 	var SpinWheel004 = CreateObject(SpinWheel, 1223, 1545);
+	SpinWheel004->SetPosition(1223, 1545);
 	SpinWheel004->SetSwitchTarget(StoneDoor005);
 	var SpinWheel005 = CreateObjectAbove(SpinWheel, 1117, 1048);
 	SpinWheel005->SetSwitchTarget(StoneDoor006);
@@ -573,8 +271,557 @@ func InitializeObjects()
 	Column002->SetR(180);
 	Column002->SetClrModulation(0xffffd0d0);
 	Column002->SetMeshMaterial("AncientColumn", 0);
+	Column002->SetPosition(779, 488);
 	var Column003 = CreateObject(Column, 1419, 217);
 	Column003->SetMeshMaterial("AncientColumn", 0);
-	CreateObject(Column, 1386, 616);
+	Column003->SetPosition(1419, 217);
+	var Column004 = CreateObject(Column, 1386, 616);
+	Column004->SetPosition(1386, 616);
+
+	g_flagpole = CreateObject(Flagpole, 210, 1151);
+	g_flagpole->SetPosition(210, 1151);
+	g_flagpole.StaticSaveVar = "g_flagpole";
+	g_flagpole->SetName("Respawn");
+	g_flagpole->SetNeutral(true);
+
+	var LotsOfCoins001 = CreateObject(LotsOfCoins, 805, 583);
+	LotsOfCoins001.Plane = 200;
+	LotsOfCoins001->SetPosition(805, 583);
+
+	g_golden_idol = CreateObject(Idol, 824, 568);
+	g_golden_idol->SetR(-4);
+	g_golden_idol.Plane = 220;
+	g_golden_idol.StaticSaveVar = "g_golden_idol";
+	g_golden_idol->SetPosition(824, 568);
+
+	var Lorry002 = CreateObjectAbove(Lorry, 200, 1183);
+	var Lorry001 = CreateObjectAbove(Lorry, 708, 1407);
+	Lorry001->SetMeshMaterial("RuinedLorry", 0);
+
+	var Catapult001 = CreateObjectAbove(Catapult, 1714, 951);
+	Catapult001->SetRDir(-7);
+
+	CreateObjectAbove(StrawMan, 1924, 439);
+	CreateObjectAbove(StrawMan, 2642, 705);
+	var Clonk001 = CreateObjectAbove(Clonk, 316, 431);
+	Clonk001->SetName("Wächter");
+	AI->AddAI(Clonk001);
+	AI->SetHome(Clonk001, 315, 422, DIR_Left);
+	AI->SetGuardRange(Clonk001, 296, 322, 350, 140);
+	AI->SetMaxAggroDistance(Clonk001);
+	AI->SetEncounterCB(Clonk001, "EncounterCastle");
+	Clonk001->Unstick(7);
+	Clonk001->SetDir(DIR_Left);
+	var Clonk002 = CreateObjectAbove(Clonk, 501, 454);
+	Clonk002->SetDir(DIR_Right);
+	Clonk002->SetName("Wächter");
+	AI->AddAI(Clonk002);
+	AI->SetHome(Clonk002, 502, 445, DIR_Right);
+	AI->SetGuardRange(Clonk002, 460, 300, 200, 160);
+	AI->SetMaxAggroDistance(Clonk002, 60);
+	Clonk002->Unstick(7);
+	var Clonk003 = CreateObjectAbove(Clonk, 534, 455);
+	Clonk003->SetDir(DIR_Right);
+	Clonk003->SetName("Wächter");
+	AI->AddAI(Clonk003);
+	AI->SetGuardRange(Clonk003, 460, 300, 200, 160);
+	AI->SetMaxAggroDistance(Clonk003, 60);
+	Clonk003->Unstick(7);
+	var Clonk004 = CreateObjectAbove(Clonk, 671, 638);
+	Clonk004->SetDir(DIR_Right);
+	Clonk004->SetCon(150);
+	Clonk004->SetColor(0xffffa000);
+	Clonk004->SetName("Schatzsucher");
+	AI->AddAI(Clonk004);
+	AI->SetHome(Clonk004, 671, 629, DIR_Right);
+	AI->SetGuardRange(Clonk004, 580, 480, 320, 175);
+	AI->SetMaxAggroDistance(Clonk004);
+	AI->SetEncounterCB(Clonk004, "EncounterFinal");
+	Clonk004->Unstick(7);
+	npc_dagobert = CreateObjectAbove(Clonk, 369, 1142);
+	npc_dagobert->SetColor(0xffa000);
+	npc_dagobert->SetName("Dagobert");
+	npc_dagobert.StaticSaveVar = "npc_dagobert";
+	npc_dagobert->MakeInvincible();
+	npc_dagobert->Unstick(7);
+	npc_dagobert->SetDir(DIR_Left);
+	var Clonk005 = CreateObjectAbove(Clonk, 1720, 375);
+	Clonk005->SetDir(DIR_Right);
+	Clonk005->SetColor(0x808080);
+	Clonk005->Unstick(7);
+	Clonk005->SetName("Otto");
+	Clonk005->MakeInvincible();
+	Clonk005->SetSkin(2);
+	var Clonk006 = CreateObjectAbove(Clonk, 1868, 951);
+	Clonk006->SetColor(0xff0000);
+	Clonk006->SetName("Donald");
+	Clonk006->MakeInvincible();
+	Clonk006->Unstick(7);
+	Clonk006->SetDir(DIR_Left);
+	var Clonk007 = CreateObjectAbove(Clonk, 676, 943);
+	Clonk007->SetDir(DIR_Right);
+	Clonk007->SetColor(0x802000);
+	Clonk007->Unstick(7);
+	Clonk007->SetName("Jane");
+	Clonk007->MakeInvincible();
+	Clonk007->SetSkin(1);
+	npc_tarzan = CreateObjectAbove(Clonk, 750, 859);
+	npc_tarzan->SetXDir(3);
+	npc_tarzan->SetYDir(27);
+	npc_tarzan->SetColor(0x402000);
+	npc_tarzan->SetName("Tarzan");
+	npc_tarzan.StaticSaveVar = "npc_tarzan";
+	npc_tarzan->Unstick(7);
+	npc_tarzan->SetDir(DIR_Left);
+	var Clonk008 = CreateObjectAbove(Clonk, 498, 966);
+	Clonk008->SetColor(0x20ffff);
+	Clonk008->Unstick(7);
+	Clonk008->SetName("Sophie");
+	Clonk008->MakeInvincible();
+	Clonk008->SetSkin(3);
+	Clonk008->SetDir(DIR_Left);
+	var Clonk009 = CreateObjectAbove(Clonk, 853, 734);
+	Clonk009->SetDir(DIR_Right);
+	Clonk009->SetColor(0x6000);
+	Clonk009->Unstick(7);
+	Clonk009->SetName("Riku");
+	Clonk009->SetSkin(2);
+	var Clonk010 = CreateObjectAbove(Clonk, 1098, 1151);
+	Clonk010->SetDir(DIR_Right);
+	Clonk010->SetColor(0x800000);
+	Clonk010->Unstick(7);
+	Clonk010->SetName("Ann");
+	Clonk010->MakeInvincible();
+	Clonk010->SetSkin(3);
+	var Dialogue001 = npc_dagobert->SetDialogue("Dagobert",true);
+	var Dialogue002 = Clonk005->SetDialogue("Otto",true);
+
+	var GrappleBow001 = npc_tarzan->CreateContents(GrappleBow);
+	GrappleBow001->SetPosition(750, 850);
+	var GrappleBow002 = npc_tarzan->CreateContents(GrappleBow);
+	GrappleBow002->SetPosition(750, 850);
+
+	var Dialogue003 = npc_tarzan->SetDialogue("Tarzan",false);
+	var Dialogue004 = Clonk007->SetDialogue("Jane",true);
+	var Dialogue005 = Clonk006->SetDialogue("Donald",true);
+
+	var TeleGlove001 = Clonk008->CreateContents(TeleGlove);
+	TeleGlove001->SetPosition(498, 957);
+
+	var Dialogue006 = Clonk008->SetDialogue("Sophie",true);
+	var Dialogue007 = Clonk009->SetDialogue("Riku",true);
+
+	var Pickaxe001 = Clonk010->CreateContents(Pickaxe);
+	Pickaxe001->SetPosition(1098, 1142);
+
+	var Dialogue008 = Clonk010->SetDialogue("Ann",true);
+
+	CreateObjectAbove(Skull, 46, 1175);
+
+	var Bone001 = CreateObject(Bone, 19, 1166);
+	Bone001->SetR(-65);
+	Bone001->SetPosition(19, 1166);
+	Bone001->Unstick(7);
+	var Bone002 = CreateObject(Bone, 41, 1172);
+	Bone002->SetR(-51);
+	Bone002->SetPosition(41, 1172);
+	var Bone003 = CreateObject(Bone, 472, 966);
+	Bone003->SetR(-41);
+	Bone003->SetRDir(11);
+	Bone003->SetPosition(472, 966);
+	var Bone004 = CreateObject(Bone, 488, 964);
+	Bone004->SetR(-51);
+	Bone004->SetYDir(8);
+	Bone004->SetPosition(488, 964);
+	var Bone005 = CreateObject(Bone, 479, 964);
+	Bone005->SetR(-51);
+	Bone005->SetPosition(479, 964);
+	var Bone006 = CreateObject(Bone, 464, 965);
+	Bone006->SetR(-51);
+	Bone006->SetPosition(464, 965);
+
+	var Loam001 = Lorry002->CreateContents(Loam);
+	Loam001->SetPosition(200, 1176);
+	var Loam002 = Lorry002->CreateContents(Loam);
+	Loam002->SetPosition(200, 1176);
+	var Loam003 = Lorry002->CreateContents(Loam);
+	Loam003->SetPosition(200, 1176);
+	var Loam004 = Lorry002->CreateContents(Loam);
+	Loam004->SetPosition(200, 1176);
+	var Loam005 = CreateObject(Loam, 153, 1232);
+	Loam005->SetPosition(153, 1232);
+	var Loam006 = CreateObject(Loam, 357, 1317);
+	Loam006->SetPosition(357, 1317);
+	var Loam007 = CreateObject(Loam, 265, 1451);
+	Loam007->SetPosition(265, 1451);
+	var Loam008 = CreateObject(Loam, 528, 1450);
+	Loam008->SetPosition(528, 1450);
+	var Loam009 = CreateObject(Loam, 554, 1453);
+	Loam009->SetPosition(554, 1453);
+	var Loam010 = CreateObject(Loam, 988, 1284);
+	Loam010->SetPosition(988, 1284);
+	var Loam011 = CreateObject(Loam, 1030, 1272);
+	Loam011->SetPosition(1030, 1272);
+	var Loam012 = CreateObject(Loam, 1065, 1267);
+	Loam012->SetPosition(1065, 1267);
+	var Loam013 = CreateObject(Loam, 1051, 1258);
+	Loam013->SetPosition(1051, 1258);
+	var Loam014 = CreateObject(Loam, 1049, 1279);
+	Loam014->SetPosition(1049, 1279);
+	var Loam015 = CreateObject(Loam, 1081, 1266);
+	Loam015->SetPosition(1081, 1266);
+	var Loam016 = CreateObject(Loam, 1334, 1049);
+	Loam016->SetPosition(1334, 1049);
+	var Loam017 = CreateObject(Loam, 1532, 858);
+	Loam017->SetPosition(1532, 858);
+	var Loam018 = CreateObject(Loam, 1619, 804);
+	Loam018->SetPosition(1619, 804);
+	var Loam019 = CreateObject(Loam, 1642, 439);
+	Loam019->SetPosition(1642, 439);
+	var Loam020 = CreateObject(Loam, 1694, 399);
+	Loam020->SetPosition(1694, 399);
+	var Loam021 = CreateObject(Loam, 1578, 524);
+	Loam021->SetPosition(1578, 524);
+	var Loam022 = CreateObject(Loam, 1746, 456);
+	Loam022->SetPosition(1746, 456);
+
+	var Metal001 = CreateObject(Metal, 1922, 976);
+	Metal001->SetR(20);
+	Metal001->SetPosition(1922, 976);
+
+	var Nugget001 = CreateObject(Nugget, 812, 589);
+	Nugget001->SetClrModulation(0xffffd0a0);
+	Nugget001->SetPosition(812, 589);
+	var Nugget002 = CreateObject(Nugget, 869, 582);
+	Nugget002->SetPosition(869, 582);
+	var Nugget003 = CreateObject(Nugget, 853, 583);
+	Nugget003->SetClrModulation(0xffffd0a0);
+	Nugget003->SetPosition(853, 583);
+	var Nugget004 = CreateObject(Nugget, 823, 583);
+	Nugget004->SetClrModulation(0xffffd0a0);
+	Nugget004->SetPosition(823, 583);
+
+	var GoldBar001 = Chest010->CreateContents(GoldBar);
+	GoldBar001->SetPosition(546, 372);
+	var GoldBar002 = Chest011->CreateContents(GoldBar);
+	GoldBar002->SetPosition(1765, 1180);
+	var GoldBar003 = Chest012->CreateContents(GoldBar);
+	GoldBar003->SetPosition(1428, 1531);
+	var GoldBar004 = Chest013->CreateContents(GoldBar);
+	GoldBar004->SetPosition(853, 1563);
+	var GoldBar005 = Lorry001->CreateContents(GoldBar);
+	GoldBar005->SetPosition(708, 1400);
+	var GoldBar006 = Chest006->CreateContents(GoldBar);
+	GoldBar006->SetPosition(840, 36);
+	var GoldBar007 = Chest014->CreateContents(GoldBar);
+	GoldBar007->SetPosition(1943, 703);
+	var GoldBar008 = Chest015->CreateContents(GoldBar);
+	GoldBar008->SetPosition(2103, 1108);
+	var GoldBar009 = Chest016->CreateContents(GoldBar);
+	GoldBar009->SetPosition(397, 572);
+	var GoldBar010 = Chest001->CreateContents(GoldBar);
+	GoldBar010->SetPosition(1002, 302);
+	var GoldBar011 = Chest017->CreateContents(GoldBar);
+	GoldBar011->SetPosition(720, 341);
+	var GoldBar012 = Chest018->CreateContents(GoldBar);
+	GoldBar012->SetPosition(2662, 1346);
+	var GoldBar013 = Chest019->CreateContents(GoldBar);
+	GoldBar013->SetPosition(730, 124);
+	GoldBar013->SetClrModulation(0xffffd0a0);
+	var GoldBar014 = CreateObject(GoldBar, 880, 540);
+	GoldBar014->SetR(-29);
+	GoldBar014->SetClrModulation(0xffffd0a0);
+	GoldBar014->SetPosition(880, 540);
+	var GoldBar015 = ToolsWorkshop001->CreateContents(GoldBar);
+	GoldBar015->SetPosition(1169, 884);
+	var GoldBar016 = CreateObject(GoldBar, 72, 1463);
+	GoldBar016->SetPosition(72, 1463);
+	GoldBar016->Unstick(7);
+	var GoldBar017 = CreateObject(GoldBar, 2746, 736);
+	GoldBar017->SetPosition(2746, 736);
+	var GoldBar018 = CreateObject(GoldBar, 2507, 1262);
+	GoldBar018->SetPosition(2507, 1262);
+	GoldBar018->Unstick(7);
+	var GoldBar019 = Chest020->CreateContents(GoldBar);
+	GoldBar019->SetPosition(1626, 1580);
+	var GoldBar020 = CreateObject(GoldBar, 972, 1277);
+	GoldBar020->SetR(55);
+	GoldBar020->SetPosition(972, 1277);
+
+	var Ruby001 = CreateObject(Ruby, 864, 581);
+	Ruby001->SetPosition(864, 581);
+	var Ruby002 = CreateObject(Ruby, 806, 583);
+	Ruby002->SetPosition(806, 583);
+	var Ruby003 = CreateObject(Ruby, 849, 578);
+	Ruby003->SetPosition(849, 578);
+	var Ruby004 = CreateObject(Ruby, 856, 584);
+	Ruby004->SetPosition(856, 584);
+
+	var Amethyst002 = CreateObject(Amethyst, 793, 584);
+	Amethyst002->SetR(22);
+	Amethyst002->SetPosition(793, 584);
+	CreateObjectAbove(Amethyst, 885, 561);
+	CreateObjectAbove(Amethyst, 828, 585);
+
+	var Dynamite001 = Lorry002->CreateContents(Dynamite);
+	Dynamite001->SetPosition(200, 1176);
+	var Dynamite002 = Lorry002->CreateContents(Dynamite);
+	Dynamite002->SetPosition(200, 1176);
+	var Dynamite003 = Chest006->CreateContents(Dynamite);
+	Dynamite003->SetPosition(840, 36);
+	var Dynamite004 = Chest006->CreateContents(Dynamite);
+	Dynamite004->SetPosition(840, 36);
+	var Dynamite005 = Chest006->CreateContents(Dynamite);
+	Dynamite005->SetPosition(840, 36);
+	CreateObjectAbove(Dynamite, 790, 736);
+	var Dynamite006 = Chest005->CreateContents(Dynamite);
+	Dynamite006->SetPosition(603, 931);
+	var Dynamite007 = Chest005->CreateContents(Dynamite);
+	Dynamite007->SetPosition(603, 931);
+	var Dynamite008 = Chest004->CreateContents(Dynamite);
+	Dynamite008->SetPosition(624, 932);
+	var Dynamite009 = Chest004->CreateContents(Dynamite);
+	Dynamite009->SetPosition(624, 932);
+	var Dynamite010 = Chest002->CreateContents(Dynamite);
+	Dynamite010->SetPosition(515, 956);
+	var Dynamite011 = Chest012->CreateContents(Dynamite);
+	Dynamite011->SetPosition(1428, 1531);
+	var Dynamite012 = Chest012->CreateContents(Dynamite);
+	Dynamite012->SetPosition(1428, 1531);
+	var Dynamite013 = Chest012->CreateContents(Dynamite);
+	Dynamite013->SetPosition(1428, 1531);
+	var Dynamite014 = Chest014->CreateContents(Dynamite);
+	Dynamite014->SetPosition(1943, 703);
+	var Dynamite015 = Chest014->CreateContents(Dynamite);
+	Dynamite015->SetPosition(1943, 703);
+	var Dynamite016 = Chest014->CreateContents(Dynamite);
+	Dynamite016->SetPosition(1943, 703);
+
+	var Bow001 = Clonk001->CreateContents(Bow);
+	Bow001->SetPosition(316, 422);
+	var Bow002 = Chest003->CreateContents(Bow);
+	Bow002->SetPosition(227, 749);
+
+	var Arrow001 = Bow001->CreateContents(Arrow);
+	Arrow001->SetPosition(316, 422);
+	var Arrow002 = Clonk001->CreateContents(Arrow);
+	Arrow002->SetPosition(316, 422);
+	var Arrow003 = CreateObject(Arrow, 313, 431);
+	Arrow003->SetR(90);
+	Arrow003->SetPosition(313, 431);
+	Arrow003->Unstick(7);
+	var Arrow004 = CreateObject(Arrow, 313, 431);
+	Arrow004->SetR(90);
+	Arrow004->SetPosition(313, 431);
+	Arrow004->Unstick(7);
+	var Arrow005 = CreateObject(Arrow, 313, 431);
+	Arrow005->SetR(90);
+	Arrow005->SetPosition(313, 431);
+	Arrow005->Unstick(7);
+	var Arrow006 = CreateObject(Arrow, 313, 431);
+	Arrow006->SetR(90);
+	Arrow006->SetPosition(313, 431);
+	Arrow006->Unstick(7);
+	var Arrow007 = CreateObject(Arrow, 313, 431);
+	Arrow007->SetR(90);
+	Arrow007->SetPosition(313, 431);
+	Arrow007->Unstick(7);
+	var Arrow008 = CreateObject(Arrow, 313, 431);
+	Arrow008->SetR(90);
+	Arrow008->SetPosition(313, 431);
+	Arrow008->Unstick(7);
+	var Arrow009 = CreateObject(Arrow, 313, 431);
+	Arrow009->SetR(90);
+	Arrow009->SetPosition(313, 431);
+	Arrow009->Unstick(7);
+	var Arrow010 = CreateObject(Arrow, 313, 431);
+	Arrow010->SetR(90);
+	Arrow010->SetPosition(313, 431);
+	Arrow010->Unstick(7);
+	var Arrow011 = CreateObject(Arrow, 313, 431);
+	Arrow011->SetR(90);
+	Arrow011->SetPosition(313, 431);
+	Arrow011->Unstick(7);
+	var Arrow012 = Chest003->CreateContents(Arrow);
+	Arrow012->SetPosition(227, 749);
+
+	var Bread001 = Chest021->CreateContents(Bread);
+	Bread001->SetPosition(472, 444);
+	var Bread002 = Chest021->CreateContents(Bread);
+	Bread002->SetPosition(472, 444);
+	var Bread003 = Lorry001->CreateContents(Bread);
+	Bread003->SetPosition(708, 1400);
+	var Bread004 = Lorry001->CreateContents(Bread);
+	Bread004->SetPosition(708, 1400);
+	var Bread005 = Lorry001->CreateContents(Bread);
+	Bread005->SetPosition(708, 1400);
+	var Bread006 = Chest004->CreateContents(Bread);
+	Bread006->SetPosition(624, 932);
+	var Bread007 = Chest017->CreateContents(Bread);
+	Bread007->SetPosition(720, 341);
+	var Bread008 = Chest009->CreateContents(Bread);
+	Bread008->SetPosition(1830, 475);
+	var Bread009 = ToolsWorkshop001->CreateContents(Bread);
+	Bread009->SetPosition(1169, 884);
+	var Bread010 = Chest011->CreateContents(Bread);
+	Bread010->SetPosition(1765, 1180);
+	var Bread011 = Chest012->CreateContents(Bread);
+	Bread011->SetPosition(1428, 1531);
+	var Bread012 = Chest018->CreateContents(Bread);
+	Bread012->SetPosition(2662, 1346);
+	var Bread013 = Chest007->CreateContents(Bread);
+	Bread013->SetPosition(1878, 708);
+	var Bread014 = Chest002->CreateContents(Bread);
+	Bread014->SetPosition(515, 956);
+
+	var DynamiteBox001 = Chest021->CreateContents(DynamiteBox);
+	DynamiteBox001->SetPosition(472, 444);
+	var DynamiteBox002 = Chest021->CreateContents(DynamiteBox);
+	DynamiteBox002->SetPosition(472, 444);
+	var DynamiteBox003 = Chest017->CreateContents(DynamiteBox);
+	DynamiteBox003->SetPosition(720, 341);
+	var DynamiteBox004 = Chest017->CreateContents(DynamiteBox);
+	DynamiteBox004->SetPosition(720, 341);
+	var DynamiteBox005 = Chest020->CreateContents(DynamiteBox);
+	DynamiteBox005->SetPosition(1626, 1580);
+	var DynamiteBox006 = Chest015->CreateContents(DynamiteBox);
+	DynamiteBox006->SetPosition(2103, 1108);
+	var DynamiteBox007 = Chest019->CreateContents(DynamiteBox);
+	DynamiteBox007->SetPosition(730, 124);
+
+	var Sword001 = Clonk003->CreateContents(Sword);
+	Sword001->SetPosition(534, 446);
+	var Sword002 = Clonk002->CreateContents(Sword);
+	Sword002->SetPosition(501, 445);
+	var Sword003 = Chest006->CreateContents(Sword);
+	Sword003->SetPosition(840, 36);
+	var Sword004 = Clonk004->CreateContents(Sword);
+	Sword004->SetPosition(671, 625);
+	var Sword005 = Clonk004->CreateContents(Sword);
+	Sword005->SetPosition(671, 625);
+	var Sword006 = Lorry001->CreateContents(Sword);
+	Sword006->SetPosition(708, 1400);
+	var Sword007 = Chest003->CreateContents(Sword);
+	Sword007->SetPosition(227, 749);
+
+	CreateObjectAbove(Seaweed, 2494, 1263);
+	CreateObjectAbove(Seaweed, 2508, 1263);
+	CreateObjectAbove(Seaweed, 2520, 1263);
+	CreateObjectAbove(Seaweed, 2508, 1263);
+	CreateObjectAbove(Seaweed, 2503, 1263);
+	CreateObjectAbove(Seaweed, 2526, 1262);
+	CreateObjectAbove(Seaweed, 2516, 1263);
+	CreateObjectAbove(Seaweed, 2499, 1263);
+	CreateObjectAbove(Seaweed, 2663, 1278);
+	CreateObjectAbove(Seaweed, 2769, 1272);
+	CreateObjectAbove(Seaweed, 2751, 1279);
+	CreateObjectAbove(Seaweed, 2762, 1271);
+	CreateObjectAbove(Seaweed, 2775, 1279);
+	CreateObjectAbove(Seaweed, 2762, 1271);
+	CreateObjectAbove(Seaweed, 2659, 1279);
+	CreateObjectAbove(Seaweed, 2416, 1245);
+	CreateObjectAbove(Seaweed, 2395, 1239);
+	CreateObjectAbove(Seaweed, 2396, 1239);
+	CreateObjectAbove(Seaweed, 2332, 1145);
+	var Seaweed001 = CreateObject(Seaweed, 2407, 1239);
+	Seaweed001->SetPosition(2407, 1239);
+
+	CreateObjectAbove(Mushroom, 1580, 759);
+	CreateObjectAbove(Mushroom, 1613, 775);
+	CreateObjectAbove(Mushroom, 1525, 846);
+	CreateObjectAbove(Mushroom, 1612, 862);
+	CreateObjectAbove(Mushroom, 1321, 895);
+	CreateObjectAbove(Mushroom, 1315, 894);
+	CreateObjectAbove(Mushroom, 1343, 903);
+	CreateObjectAbove(Mushroom, 1347, 901);
+
+	var Balloon001 = CreateObjectAbove(Balloon, 491, 383);
+	Balloon001->Unstick(7);
+
+	var Barrel001 = CreateObjectAbove(Barrel, 623, 456);
+	Barrel001->SetColor(0xff000000);
+
+	CreateObjectAbove(Sproutberry, 1823, 488);
+	CreateObjectAbove(Sproutberry, 1823, 488);
+	CreateObjectAbove(Sproutberry, 1823, 488);
+
+	CreateObjectAbove(Boompack, 543, 383);
+	CreateObjectAbove(Boompack, 548, 384);
+	CreateObjectAbove(Boompack, 1948, 713);
+	var Boompack001 = CreateObject(Boompack, 1944, 483);
+	Boompack001->SetR(135);
+	Boompack001->SetPosition(1944, 483);
+
+	g_golden_shovel = CreateObjectAbove(Shovel, 1841, 1011);
+	g_golden_shovel->SetMeshMaterial("GoldenShovel", 0);
+	g_golden_shovel.StaticSaveVar = "g_golden_shovel";
+
+	var Pipe001 = CreateObject(Pipe, 1838, 1013);
+	Pipe001->SetPosition(1838, 1013);
+	Pipe001->SetNeutralPipe();
+
+	var LotsOfCoins002 = CreateObject(LotsOfCoins, 838, 583);
+	LotsOfCoins002.Plane = 500;
+	LotsOfCoins002->SetPosition(838, 583);
+
+	var GemOfPower001 = CreateObjectAbove(GemOfPower, 825, 572);
+	GemOfPower001->SetCategory(C4D_StaticBack);
+
+	CreateObjectAbove(Firestone, 564, 1136);
+	CreateObjectAbove(Firestone, 552, 1136);
+	CreateObjectAbove(Firestone, 562, 1136);
+	CreateObjectAbove(Firestone, 571, 1136);
+	CreateObjectAbove(Firestone, 567, 1136);
+	var Firestone001 = CreateObject(Firestone, 558, 1135);
+	Firestone001->SetPosition(558, 1135);
+	var Firestone002 = CreateObject(Firestone, 546, 1135);
+	Firestone002->SetPosition(546, 1135);
+	CreateObjectAbove(Firestone, 560, 1136);
+	var Firestone003 = CreateObject(Firestone, 546, 1135);
+	Firestone003->SetPosition(546, 1135);
+	var Firestone004 = CreateObject(Firestone, 546, 1135);
+	Firestone004->SetPosition(546, 1135);
+	var Firestone005 = CreateObject(Firestone, 555, 1135);
+	Firestone005->SetPosition(555, 1135);
+	CreateObjectAbove(Firestone, 562, 1136);
+	var Firestone006 = CreateObject(Firestone, 550, 1135);
+	Firestone006->SetPosition(550, 1135);
+	CreateObjectAbove(Firestone, 552, 1136);
+	var Firestone007 = CreateObject(Firestone, 342, 1224);
+	Firestone007->SetPosition(342, 1224);
+	var Firestone008 = CreateObject(Firestone, 166, 1260);
+	Firestone008->SetPosition(166, 1260);
+	var Firestone009 = CreateObject(Firestone, 234, 1423);
+	Firestone009->SetPosition(234, 1423);
+	var Firestone010 = CreateObjectAbove(Firestone, 315, 431);
+	Firestone010->Unstick(7);
+	var Firestone011 = CreateObject(Firestone, 1359, 1060);
+	Firestone011->SetPosition(1359, 1060);
+	var Firestone012 = CreateObject(Firestone, 1348, 1041);
+	Firestone012->SetPosition(1348, 1041);
+	var Firestone013 = CreateObject(Firestone, 1384, 1054);
+	Firestone013->SetPosition(1384, 1054);
+	var Firestone014 = CreateObject(Firestone, 1417, 1106);
+	Firestone014->SetPosition(1417, 1106);
+	var Firestone015 = CreateObject(Firestone, 1432, 1112);
+	Firestone015->SetPosition(1432, 1112);
+	var Firestone016 = CreateObject(Firestone, 1436, 1103);
+	Firestone016->SetPosition(1436, 1103);
+	var Firestone017 = CreateObject(Firestone, 1340, 919);
+	Firestone017->SetPosition(1340, 919);
+	var Firestone018 = CreateObject(Firestone, 1476, 875);
+	Firestone018->SetPosition(1476, 875);
+	var Firestone019 = CreateObject(Firestone, 1549, 865);
+	Firestone019->SetPosition(1549, 865);
+	var Firestone020 = CreateObject(Firestone, 1607, 791);
+	Firestone020->SetPosition(1607, 791);
+	var Firestone021 = CreateObject(Firestone, 2053, 851);
+	Firestone021->SetPosition(2053, 851);
+	var Firestone022 = CreateObject(Firestone, 2161, 942);
+	Firestone022->SetPosition(2161, 942);
+	var Firestone023 = CreateObject(Firestone, 2073, 861);
+	Firestone023->SetPosition(2073, 861);
+	var Firestone024 = CreateObject(Firestone, 2064, 851);
+	Firestone024->SetPosition(2064, 851);
 	return true;
 }
diff --git a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/OilBarrel.c b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/OilBarrel.c
index db036e1c8..25b0e773d 100644
--- a/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/OilBarrel.c
+++ b/planet/Missions.ocf/TreasureHunt.ocs/System.ocg/OilBarrel.c
@@ -1,15 +1,21 @@
+// Goal timer: Barrel has to be brought to the plane
+// Doesn't matter if container or not.
+
 #appendto MetalBarrel
 
-func Exit(...)
+public func Initialize(...)
 {
-	// dropping at plane? then put into plane
-	if (Contained() && Contained()->GetAlive())
+	AddTimer(this.CheckForPlane, 20);
+	return _inherited(...);
+}
+
+private func CheckForPlane()
+{
+	var plane = FindObject(Find_ID(Airplane), Find_AtPoint());
+	if (plane)
 	{
-		var plane = FindObject(Find_ID(Airplane), Find_AtPoint());
-		if (plane)
-		{
-			ScheduleCall(nil, Global.GameCall, 1,1, "OnPlaneLoaded", plane, this);
-		}
+		ScheduleCall(nil, Global.GameCall, 1,1, "OnPlaneLoaded", plane, this);
+		RemoveTimer(this.CheckForPlane);
 	}
-	return inherited(...);
-}
\ No newline at end of file
+}
+