diff --git a/scripts/bricks.cs b/scripts/bricks.cs
index 4a40764..f77ffc7 100644
--- a/scripts/bricks.cs
+++ b/scripts/bricks.cs
@@ -1,171 +1,201 @@
-function lualogic_addwire(%wire)
-{
-	%color = %wire.getColorID();
-
-	%box = %wire.getWorldBox();
-
-	%minX = mFloatLength(getWord(%box, 0)*2, 0)/2;
-	%minY = mFloatLength(getWord(%box, 1)*2, 0)/2;
-	%minZ = mFloatLength(getWord(%box, 2)*5, 0)/5;
-
-	%maxX = mFloatLength(getWord(%box, 3)*2, 0)/2;
-	%maxY = mFloatLength(getWord(%box, 4)*2, 0)/2;
-	%maxZ = mFloatLength(getWord(%box, 5)*5, 0)/5;
-
-	%min = lualogic_pos(%minX SPC %minY SPC %minZ);
-	%max = lualogic_pos(%maxX SPC %maxY SPC %maxZ);
-
-	lualogic_send("W;" @ %wire.getID() @ ";" @ %color @ ";" @ %min @ ";" @ %max);
-	%wire.logicIsAdded = true;
-}
-
-function lualogic_addgate(%gate)
-{
-	%db = %gate.getDataBlock();
-	%pos = lualogic_pos(%gate.getPosition());
-	%rot = %gate.angleId;
-
-	%data = "G;" @ %gate.getID() @ ";" @ %db @ ";" @ %pos @ ";" @ %rot;
-
-	lualogic_send(%data);
-	%gate.logicIsAdded = true;
-
-	if(isFunction(%db.getName(), "Logic_onAdd"))
-		%db.Logic_onAdd(%gate);
-}
-
-function lualogic_removewire(%wire)
-{
-	if(%wire.logicIsRemoved == false)
-	{
-		lualogic_send("RW;" @ %wire);
-		%wire.logicIsRemoved = true;
-	}
-}
-
-function lualogic_removegate(%gate)
-{
-	if(%gate.logicIsRemoved == false)
-	{
-		%db = %gate.getDataBlock();
-		if(isFunction(%db.getName(), "Logic_onRemove"))
-			%db.Logic_onRemove(%gate);
-
-		lualogic_send("RG;" @ %gate);
-		%gate.logicIsRemoved = true;
-	}
-}
-
-function lualogic_sendall()
-{
-	%groups = mainBrickGroup.getCount();
-	for(%i = 0; %i < %groups; %i++)
-	{
-		%group = mainBrickGroup.getObject(%i);
-		%bricks = %group.getCount();
-		for(%a = 0; %a < %bricks; %a++)
-		{
-			%brick = %group.getObject(%a);
-			%data = %brick.getDataBlock();
-			if(%data.isLogic && %brick.isPlanted())
-			{
-				if(%data.isLogicWire)
-					lualogic_addwire(%brick);
-				else if(%data.isLogicGate)
-					lualogic_addgate(%brick);
-			}
-		}
-	}
-}
-
-function fxDTSBrick::Logic_SetOutput(%this, %port, %state)
-{
-	lualogic_send("SP;" @ %this @ ";" @ %port+1 @ ";" @ %state);
-}
-
-package LuaLogic_Bricks
-{
-	function fxDTSBrickData::onPlant(%this, %brick)
-	{
-		parent::onPlant(%this, %brick);
-
-		if(isObject(%brick) && %this.isLogic)
-		{
-			if(%this.isLogicWire)
-				lualogic_addwire(%brick);
-			else if(%this.isLogicGate)
-				lualogic_addgate(%brick);
-		}
-	}
-
-	function fxDTSBrickData::onLoadPlant(%this, %brick)
-	{
-		parent::onLoadPlant(%this, %brick);
-
-		if(isObject(%brick) && %this.isLogic)
-		{
-			if(%this.isLogicWire)
-				lualogic_addwire(%brick);
-			else if(%this.isLogicGate)
-				lualogic_addgate(%brick);
-		}
-	}
-
-	function fxDTSBrickData::onColorChange(%data, %obj)
-	{
-		parent::onColorChange(%data, %obj);
-
-		if(isObject(%obj) && %obj.isPlanted() && !%obj.isDead() && %data.isLogic && %data.isLogicWire)
-			lualogic_send("SL;" @ %obj @ ";" @ %obj.getColorID());
-	}
-
-	function fxDTSBrickData::onDeath(%this, %brick)
-	{
-		if(%this.isLogic)
-		{
-			if(%this.isLogicWire)
-				lualogic_removewire(%brick);
-			else if(%this.isLogicGate)
-				lualogic_removegate(%brick);
-		}
-
-		parent::onDeath(%this, %brick);
-	}
-
-	function fxDTSBrickData::onRemove(%this, %brick)
-	{
-		if(%this.isLogic && %brick.logicIsAdded)
-		{
-			if(%this.isLogicWire)
-				lualogic_removewire(%brick);
-			else if(%this.isLogicGate)
-				lualogic_removegate(%brick);
-		}
-
-		parent::onRemove(%this, %brick);
-	}
-
-	function Player::activateStuff(%this, %a, %b)
-	{
-		parent::activateStuff(%this, %a, %b);
-
-		if(isObject(%client = %this.client))
-		{
-			%eye = %this.getEyePoint();
-			%vec = %this.getEyeVector();
-			%ray = containerRayCast(%eye, vectorAdd(%eye, vectorScale(%vec, 5*getWord(%this.getScale(), 2))), $TypeMasks::FxBrickObjectType);
-			if(isObject(%hit = firstWord(%ray)))
-			{
-				%data = %hit.getDataBlock();
-				if(%data.isLogic)
-				{
-					if(%data.isLogicInput)
-						%data.Logic_onInput(%hit, %hitPos, %hitNorm, %client);
-					else
-						lualogic_send("GINFO;" @ %client @ ";" @ %hit);
-				}
-			}
-		}
-	}
-};
-activatePackage("LuaLogic_Bricks");
+function lualogic_addwire(%wire)
+{
+	%color = %wire.getColorID();
+
+	%box = %wire.getWorldBox();
+
+	%minX = mFloatLength(getWord(%box, 0)*2, 0)/2;
+	%minY = mFloatLength(getWord(%box, 1)*2, 0)/2;
+	%minZ = mFloatLength(getWord(%box, 2)*5, 0)/5;
+
+	%maxX = mFloatLength(getWord(%box, 3)*2, 0)/2;
+	%maxY = mFloatLength(getWord(%box, 4)*2, 0)/2;
+	%maxZ = mFloatLength(getWord(%box, 5)*5, 0)/5;
+
+	%min = lualogic_pos(%minX SPC %minY SPC %minZ);
+	%max = lualogic_pos(%maxX SPC %maxY SPC %maxZ);
+
+	lualogic_send("W;" @ %wire.getID() @ ";" @ %color @ ";" @ %min @ ";" @ %max);
+	%wire.logicIsAdded = true;
+}
+
+function lualogic_addgate(%gate)
+{
+	%db = %gate.getDataBlock();
+	%pos = lualogic_pos(%gate.getPosition());
+	%rot = %gate.angleId;
+
+	%data = "G;" @ %gate.getID() @ ";" @ %db @ ";" @ %pos @ ";" @ %rot;
+
+	lualogic_send(%data);
+	%gate.logicIsAdded = true;
+
+	if(isFunction(%db.getName(), "Logic_onAdd"))
+		%db.Logic_onAdd(%gate);
+}
+
+function lualogic_removewire(%wire)
+{
+	if(%wire.logicIsRemoved == false)
+	{
+		lualogic_send("RW;" @ %wire);
+		%wire.logicIsRemoved = true;
+	}
+}
+
+function lualogic_removegate(%gate)
+{
+	if(%gate.logicIsRemoved == false)
+	{
+		%db = %gate.getDataBlock();
+		if(isFunction(%db.getName(), "Logic_onRemove"))
+			%db.Logic_onRemove(%gate);
+
+		lualogic_send("RG;" @ %gate);
+		%gate.logicIsRemoved = true;
+	}
+}
+
+function lualogic_sendall()
+{
+	%groups = mainBrickGroup.getCount();
+	for(%i = 0; %i < %groups; %i++)
+	{
+		%group = mainBrickGroup.getObject(%i);
+		%bricks = %group.getCount();
+		for(%a = 0; %a < %bricks; %a++)
+		{
+			%brick = %group.getObject(%a);
+			%data = %brick.getDataBlock();
+			if(%data.isLogic && %brick.isPlanted())
+			{
+				if(%data.isLogicWire)
+					lualogic_addwire(%brick);
+				else if(%data.isLogicGate)
+					lualogic_addgate(%brick);
+			}
+		}
+	}
+}
+
+function fxDTSBrick::Logic_SetOutput(%this, %port, %state)
+{
+	lualogic_send("SP;" @ %this @ ";" @ %port+1 @ ";" @ %state);
+}
+
+function fxDtsBrick::Logic_HandlePlant(%brick){
+	if(!%brick.Logic_HasPlanted){
+		%brick.Logic_HasPlanted = true;
+		
+		%data = %brick.getDatablock();
+		if(isFunction(%data.getName(), "Logic_onPlant")){
+			%data.Logic_onPlant(%brick);
+		}
+	}
+}
+
+function fxDtsBrick::Logic_HandleRemove(%brick){
+	if(!%brick.Logic_HasRemoved){
+		%brick.Logic_HasRemoved = true;
+		
+		%data = %brick.getDatablock();
+		if(isFunction(%data.getName(), "Logic_onRemove")){
+			%data.Logic_onRemove(%brick);
+		}
+	}
+}
+
+package LuaLogic_Bricks
+{
+	function fxDTSBrickData::onPlant(%data, %brick)
+	{
+		parent::onPlant(%data, %brick);
+
+		if(isObject(%brick) && %data.isLogic)
+		{
+			if(%data.isLogicWire)
+				lualogic_addwire(%brick);
+			else if(%data.isLogicGate)
+				lualogic_addgate(%brick);
+			
+			%brick.Logic_HandlePlant();
+		}
+	}
+
+	function fxDTSBrickData::onLoadPlant(%this, %brick)
+	{
+		parent::onLoadPlant(%this, %brick);
+
+		if(isObject(%brick) && %this.isLogic)
+		{
+			if(%this.isLogicWire)
+				lualogic_addwire(%brick);
+			else if(%this.isLogicGate)
+				lualogic_addgate(%brick);
+			
+			%brick.Logic_HandlePlant();
+		}
+	}
+
+	function fxDTSBrickData::onColorChange(%data, %obj)
+	{
+		parent::onColorChange(%data, %obj);
+
+		if(isObject(%obj) && %obj.isPlanted() && !%obj.isDead() && %data.isLogic && %data.isLogicWire)
+			lualogic_send("SL;" @ %obj @ ";" @ %obj.getColorID());
+	}
+
+	function fxDTSBrickData::onDeath(%this, %brick)
+	{
+		if(%this.isLogic)
+		{
+			if(%this.isLogicWire)
+				lualogic_removewire(%brick);
+			else if(%this.isLogicGate)
+				lualogic_removegate(%brick);
+			
+			%brick.Logic_HandleRemove();
+		}
+
+		parent::onDeath(%this, %brick);
+	}
+
+	function fxDTSBrickData::onRemove(%this, %brick)
+	{
+		if(%this.isLogic && %brick.logicIsAdded)
+		{
+			if(%this.isLogicWire)
+				lualogic_removewire(%brick);
+			else if(%this.isLogicGate)
+				lualogic_removegate(%brick);
+			
+			%brick.Logic_HandleRemove();
+		}
+
+		parent::onRemove(%this, %brick);
+	}
+
+	function Player::activateStuff(%this, %a, %b)
+	{
+		parent::activateStuff(%this, %a, %b);
+
+		if(isObject(%client = %this.client))
+		{
+			%eye = %this.getEyePoint();
+			%vec = %this.getEyeVector();
+			%ray = containerRayCast(%eye, vectorAdd(%eye, vectorScale(%vec, 5*getWord(%this.getScale(), 2))), $TypeMasks::FxBrickObjectType);
+			if(isObject(%hit = firstWord(%ray)))
+			{
+				%data = %hit.getDataBlock();
+				if(%data.isLogic)
+				{
+					if(%data.isLogicInput)
+						%data.Logic_onInput(%hit, %hitPos, %hitNorm, %client);
+					else
+						lualogic_send("GINFO;" @ %client @ ";" @ %hit);
+				}
+			}
+		}
+	}
+};
+activatePackage("LuaLogic_Bricks");
diff --git a/scripts/lualogic.cs b/scripts/lualogic.cs
index b6d920a..b6bdd9a 100644
--- a/scripts/lualogic.cs
+++ b/scripts/lualogic.cs
@@ -117,7 +117,10 @@ package LuaLogic
 activatePackage("LuaLogic");
 
 function llr(){
+	%path = $LuaLogic::Path;
 	deleteVariables("$LuaLogic*");
+	$LuaLogic::Path = %path;
+	
 	resetAllOpCallFunc();
 	exec("./lualogic.cs");
 	schedule(3000, 0, lualogic_connect, 25000);
diff --git a/scripts/utilities.cs b/scripts/utilities.cs
index 5aa3e0c..616017c 100644
--- a/scripts/utilities.cs
+++ b/scripts/utilities.cs
@@ -11,7 +11,9 @@ function lualogic_escapelogicfunction(%text){
 }
 
 function lualogic_registergatedefinition(%data){
-	lualogic_registergatedefinition_auto(%data);
+	//lualogic_registergatedefinition_auto(%data);
+	
+	//handled automatically now
 }
 
 function lualogic_registergatedefinition_auto(%data)
@@ -19,8 +21,8 @@ function lualogic_registergatedefinition_auto(%data)
 	if(!isObject(%data))
 		return;
 	
-	if(%data.luaLogic_isRegistered)
-		return;
+	//if(%data.luaLogic_isRegistered)
+		//return;
 	
 	%id = %data.getID();
 	
@@ -48,10 +50,12 @@ function lualogic_registergatedefinition_auto(%data)
 
 	$LuaLogic::GateDefintion[%idx] = %def;
 	
-	%data.luaLogic_isRegistered = true;
+	//%data.luaLogic_isRegistered = true;
 }
 
 function lualogic_registerAllGateDefinitions(){
+	echo("LuaLogic: Registering gate definitions");
+	
 	for(%dbidx=0; %dbidx<DatablockGroup.getCount(); %dbidx++){
 		%db = DatablockGroup.getObject(%dbidx);
 		if(%db.isLogic && %db.isLogicGate){
@@ -60,7 +64,7 @@ function lualogic_registerAllGateDefinitions(){
 	}
 }
 
-lualogic_registerAllGateDefinitions();
+schedule(1, 0, lualogic_registerAllGateDefinitions);
 
 function lualogic_print(%text)
 {
diff --git a/server.cs b/server.cs
index f66ea75..b4d32e6 100644
--- a/server.cs
+++ b/server.cs
@@ -1,4 +1,4 @@
-
-$LuaLogic::Path = filePath(ExpandFilename("./server.cs")) @ "/";
-
-exec("./scripts/lualogic.cs");
+
+$LuaLogic::Path = filePath($Con::File) @ "/";
+
+exec("./scripts/lualogic.cs");