diff --git a/src/game/gamecore.cpp b/src/game/gamecore.cpp
index 7022b2230..8ff6b82a2 100644
--- a/src/game/gamecore.cpp
+++ b/src/game/gamecore.cpp
@@ -209,7 +209,7 @@ void CCharacterCore::Tick(bool UseInput)
 		}
 
 		// Check against other players first
-		if(m_pWorld && m_pWorld->m_Tuning.m_PlayerHooking)
+		if(m_pWorld && m_pWorld->m_Tuning.m_PlayerHooking)//TODO:TEAM
 		{
 			float Dist = 0.0f;
 			for(int i = 0; i < MAX_CLIENTS; i++)
@@ -309,7 +309,7 @@ void CCharacterCore::Tick(bool UseInput)
 		}
 	}
 	
-	if(m_pWorld/* && m_pWorld->m_Tuning.m_PlayerCollision*/)
+	if(m_pWorld/* && m_pWorld->m_Tuning.m_PlayerCollision*/)//TODO:TEAM
 	{
 		for(int i = 0; i < MAX_CLIENTS; i++)
 		{
@@ -323,7 +323,7 @@ void CCharacterCore::Tick(bool UseInput)
 			// handle player <-> player collision
 			float d = distance(m_Pos, p->m_Pos);
 			vec2 Dir = normalize(m_Pos - p->m_Pos);
-			if (m_pWorld->m_Tuning.m_PlayerCollision) {
+			if (m_pWorld->m_Tuning.m_PlayerCollision) {//TODO:TEAM
 				
 				if(d < PhysSize*1.25f && d > 1.0f)
 				{
diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp
index d38475055..3c10f2311 100644
--- a/src/game/server/entities/character.cpp
+++ b/src/game/server/entities/character.cpp
@@ -298,7 +298,7 @@ void CCharacter::FireWeapon()
 			m_NumObjectsHit = 0;
 			GameServer()->CreateSound(m_Pos, SOUND_HAMMER_FIRE);
 
-			if (!g_Config.m_SvHit) break;
+			if (!g_Config.m_SvHit) break;//TODO:TEAM
 
 			CCharacter *aEnts[64];
 			int Hits = 0;
diff --git a/src/game/server/entities/laser.cpp b/src/game/server/entities/laser.cpp
index 7dbbf425a..67b2457ea 100644
--- a/src/game/server/entities/laser.cpp
+++ b/src/game/server/entities/laser.cpp
@@ -30,7 +30,7 @@ bool CLaser::HitCharacter(vec2 From, vec2 To)
 	m_From = From;
 	m_Pos = At;
 	m_Energy = -1;
-	if ((m_Type == 1 && g_Config.m_SvHit))
+	if ((m_Type == 1 && g_Config.m_SvHit))//TODO:TEAM
 	{
 			Hit->m_Core.m_Vel+=normalize(m_PrevPos - Hit->m_Core.m_Pos) * 10;
 	}
diff --git a/src/game/server/entities/projectile.cpp b/src/game/server/entities/projectile.cpp
index 086160838..b9a3ce27a 100644
--- a/src/game/server/entities/projectile.cpp
+++ b/src/game/server/entities/projectile.cpp
@@ -99,7 +99,7 @@ void CProjectile::Tick()
 	if(m_LifeSpan > -1)
 		m_LifeSpan--;
 	
-	if( (TargetChr && (g_Config.m_SvHit || TargetChr == OwnerChar)) || Collide)
+	if( (TargetChr && (g_Config.m_SvHit || TargetChr == OwnerChar)) || Collide)//TODO:TEAM
 	{
 		if(m_Explosive/*??*/ && (!TargetChr || (TargetChr && !m_Freeze)))
 		{
diff --git a/src/game/server/gamecontext.cpp b/src/game/server/gamecontext.cpp
index 4a7614327..44e32f970 100644
--- a/src/game/server/gamecontext.cpp
+++ b/src/game/server/gamecontext.cpp
@@ -143,7 +143,7 @@ void CGameContext::CreateExplosion(vec2 p, int Owner, int Weapon, bool NoDamage)
 				ForceDir = normalize(Diff);
 			l = 1-clamp((l-InnerRadius)/(Radius-InnerRadius), 0.0f, 1.0f);
 			float Dmg = 6 * l;
-			if((int)Dmg)
+			if((int)Dmg)//TODO:TEAM
 				if(g_Config.m_SvHit || Owner == apEnts[i]->m_pPlayer->GetCID()) {
 					apEnts[i]->TakeDamage(ForceDir*Dmg*2, (int)Dmg, Owner, Weapon);
 					if(!g_Config.m_SvHit) break;
@@ -2031,8 +2031,6 @@ void CGameContext::OnInit(/*class IKernel *pKernel*/)
 				g_Config.m_SvEndlessDrag = 1;
 			else if (Index == TILE_NOHIT)
 				g_Config.m_SvHit = 0;
-			else if (Index == TILE_EHOOK)
-				g_Config.m_SvEndlessDrag = 1;
 			else if (Index == TILE_NPH)
 				g_Config.m_SvPhook = 0;
 			if(Index >= ENTITY_OFFSET)
@@ -2049,8 +2047,6 @@ void CGameContext::OnInit(/*class IKernel *pKernel*/)
 					g_Config.m_SvEndlessDrag = 1;
 				else if (Index == TILE_NOHIT)
 					g_Config.m_SvHit = 0;
-				else if (Index == TILE_EHOOK)
-					g_Config.m_SvEndlessDrag = 1;
 				else if (Index == TILE_NPH)
 					g_Config.m_SvPhook = 0;