diff --git a/gamedir/Data-1.13/Mod_Settings.ini b/gamedir/Data-1.13/Mod_Settings.ini
index ccc699605..15e12fa74 100644
--- a/gamedir/Data-1.13/Mod_Settings.ini
+++ b/gamedir/Data-1.13/Mod_Settings.ini
@@ -53,10 +53,10 @@ OMERTA_DROPOFF_GRIDNO = 4868
 [Omerta]
 
 [Drassen]
-;this will make John & Mary disappear on quest completion. Use different values here from LUA script for them to remain in sector
-JOHN_UNESCORT_SECTOR_X = 13
-JOHN_UNESCORT_SECTOR_Y = 2
-JOHN_UNESCORT_SECTOR_Z = 0
+;meet Carmen in sector for reward collection
+CARMEN_GIVE_REWARD_SECTOR_X = 13
+CARMEN_GIVE_REWARD_SECTOR_Y = 3
+CARMEN_GIVE_REWARD_SECTOR_Z = 0
 
 [Alma]
 ;location of rocket rifle
@@ -97,6 +97,9 @@ PORN_SHOP_ROOM_HANS = 49
 HANS_POSTION = 13523
 PORN_SHOP_ROOM_BRENDA = 47
 PORN_SHOP_ROOM_TONY = 50
+PORN_SHOP_TONY_SECTOR_X = 5
+PORN_SHOP_TONY_SECTOR_Y = 3
+PORN_SHOP_TONY_SECTOR_Z = 0
 
 ;Kyle Lemmons gets the money for the Leather Shop Deed Quest here
 KYLE_MONEY_POSITION = 14952
@@ -104,6 +107,10 @@ KYLE_MONEY_POSITION = 14952
 ;Angel's leathershop, escort Maria to this room
 ANGELS_LEATHERSHOP = 2
 
+;brothel sector
+BROTHEL_SECTOR_X = 5
+BROTHEL_SECTOR_Y = 3
+
 ;doors to the girl's rooms in the brothel
 DOOR_TO_BAMBIS_ROOM = 12290
 DOOR_TO_CARLAS_ROOM = 13413
@@ -120,6 +127,13 @@ BROTHEL_DOOR_1 = 11010
 BROTHEL_DOOR_2 = 11176
 BROTHEL_DOOR_3 = 11177
 
+;Kingpin residing location and room no to call him over for boxing match
+KINGPIN_HOUSE_SECTOR_X = 5
+KINGPIN_HOUSE_SECTOR_Y = 4
+KINGPIN_HOUSE_SECTOR_Z = 0
+FIRST_ROOM_IN_KINGPIN_HOUSE = 30
+LAST_ROOM_IN_KINGPIN_HOUSE = 39
+
 ;Kingpin's private stash. He will come looking for you if stolen
 KINGPIN_MONEY_SECTOR_X = 5
 KINGPIN_MONEY_SECTOR_Y = 4
@@ -192,4 +206,14 @@ MEDUNA_OUTSKIRTS_ROW_Y = 13
 ;column sectors to trigger meduna outskirts meanwhile
 MEDUNA_OUTSKIRTS_COL_X = 6
 MEDUNA_OUTSKIRTS_COL_MIN_Y = 14
-MEDUNA_OUTSKIRTS_COL_MAX_Y = 14
\ No newline at end of file
+MEDUNA_OUTSKIRTS_COL_MAX_Y = 14
+
+;add Madlab to location after scientist AWOL meanwhile scene. Set to (0, 0) if unused and LUA script to random location
+ADD_MADLAB_SECTOR_1_X = 7
+ADD_MADLAB_SECTOR_1_Y = 8
+ADD_MADLAB_SECTOR_2_X = 16
+ADD_MADLAB_SECTOR_2_Y = 8
+ADD_MADLAB_SECTOR_3_X = 11
+ADD_MADLAB_SECTOR_3_Y = 9
+ADD_MADLAB_SECTOR_4_X = 4
+ADD_MADLAB_SECTOR_4_Y = 5
\ No newline at end of file
diff --git a/gamedir/Data-1.13/Scripts/GameInit.lua b/gamedir/Data-1.13/Scripts/GameInit.lua
index 4782ab426..d4f07e75e 100644
--- a/gamedir/Data-1.13/Scripts/GameInit.lua
+++ b/gamedir/Data-1.13/Scripts/GameInit.lua
@@ -417,22 +417,22 @@ function InitNPCs()
 		i = math.random(1, 4)
 		if i == 1 then
 			--H7
-			AddAltSectorNew( 7, SectorY.MAP_ROW_H )
+			AddAltSectorNew( iniADD_MADLAB_SECTOR_1_X, iniADD_MADLAB_SECTOR_1_Y )
 		elseif i == 2 then
 			--H16
-			AddAltSectorNew( 16, SectorY.MAP_ROW_H )
+			AddAltSectorNew( iniADD_MADLAB_SECTOR_2_X, iniADD_MADLAB_SECTOR_2_Y )
 		elseif i == 3 then	
 			--I11
-			AddAltSectorNew( 11, SectorY.MAP_ROW_I )
+			AddAltSectorNew( iniADD_MADLAB_SECTOR_3_X, iniADD_MADLAB_SECTOR_3_Y )
 		elseif i == 4 then
 			--E4
-			AddAltSectorNew( 4, SectorY.MAP_ROW_E )
+			AddAltSectorNew( iniADD_MADLAB_SECTOR_4_X, iniADD_MADLAB_SECTOR_4_Y )
 		end
 	end
 	
 	if is_networked == 1 then
 		--H7
-		AddAltSectorNew( 7, SectorY.MAP_ROW_H )
+		AddAltSectorNew( iniADD_MADLAB_SECTOR_1_X, iniADD_MADLAB_SECTOR_1_Y )
 	end
 
 	-- Add Micky in random location
diff --git a/gamedir/Data-1.13/Scripts/StrategicEventHandler.lua b/gamedir/Data-1.13/Scripts/StrategicEventHandler.lua
index e54816ecf..711c7de4e 100644
--- a/gamedir/Data-1.13/Scripts/StrategicEventHandler.lua
+++ b/gamedir/Data-1.13/Scripts/StrategicEventHandler.lua
@@ -260,6 +260,8 @@ Profil =
 	CONRAD = 70,
 	KINGPIN = 86,
 	MADAME = 107,
+	JOHN = 118,
+	MARY = 119,
 }
 
 Facts = 
@@ -555,6 +557,22 @@ function HandleEarlyMorningEvents()
 		SetCharacterSectorZ (Profil.RAT,0)
 	end
 	
+	-- Does John leave country after quest completion?
+	JOHNid,JOHNx,JOHNy,JOHNz = CheckNPCinSector(Profil.JOHN)
+	if ( CheckQuest(Quests.QUEST_ESCORT_TOURISTS) == qStatus.QUESTDONE and JOHNx == 13 and JOHNy == 2 and JOHNz == 0 ) then
+		SetCharacterSectorX (Profil.JOHN,0)
+		SetCharacterSectorY (Profil.JOHN,0)
+		SetCharacterSectorZ (Profil.JOHN,0)
+	end
+	
+	-- Does Mary leave country after quest completion?
+	MARYid,MARYx,MARYy,MARYz = CheckNPCinSector(Profil.MARY)
+	if ( CheckQuest(Quests.QUEST_ESCORT_TOURISTS) == qStatus.QUESTDONE and MARYx == 13 and MARYy == 2 and MARYz == 0  ) then	
+		SetCharacterSectorX (Profil.MARY,0)
+		SetCharacterSectorY (Profil.MARY,0)
+		SetCharacterSectorZ (Profil.MARY,0)
+	end
+	
 	-- Empty money from pockets of Vince 69, Willis 80, and Jenny 132
 	SetMoneyInSoldierProfile( Profil.VINCE, 0 )
 	SetMoneyInSoldierProfile( Profil.STEVE, 0 )
diff --git a/gamedir/Data/Mod_Settings.ini b/gamedir/Data/Mod_Settings.ini
index ccc699605..15e12fa74 100644
--- a/gamedir/Data/Mod_Settings.ini
+++ b/gamedir/Data/Mod_Settings.ini
@@ -53,10 +53,10 @@ OMERTA_DROPOFF_GRIDNO = 4868
 [Omerta]
 
 [Drassen]
-;this will make John & Mary disappear on quest completion. Use different values here from LUA script for them to remain in sector
-JOHN_UNESCORT_SECTOR_X = 13
-JOHN_UNESCORT_SECTOR_Y = 2
-JOHN_UNESCORT_SECTOR_Z = 0
+;meet Carmen in sector for reward collection
+CARMEN_GIVE_REWARD_SECTOR_X = 13
+CARMEN_GIVE_REWARD_SECTOR_Y = 3
+CARMEN_GIVE_REWARD_SECTOR_Z = 0
 
 [Alma]
 ;location of rocket rifle
@@ -97,6 +97,9 @@ PORN_SHOP_ROOM_HANS = 49
 HANS_POSTION = 13523
 PORN_SHOP_ROOM_BRENDA = 47
 PORN_SHOP_ROOM_TONY = 50
+PORN_SHOP_TONY_SECTOR_X = 5
+PORN_SHOP_TONY_SECTOR_Y = 3
+PORN_SHOP_TONY_SECTOR_Z = 0
 
 ;Kyle Lemmons gets the money for the Leather Shop Deed Quest here
 KYLE_MONEY_POSITION = 14952
@@ -104,6 +107,10 @@ KYLE_MONEY_POSITION = 14952
 ;Angel's leathershop, escort Maria to this room
 ANGELS_LEATHERSHOP = 2
 
+;brothel sector
+BROTHEL_SECTOR_X = 5
+BROTHEL_SECTOR_Y = 3
+
 ;doors to the girl's rooms in the brothel
 DOOR_TO_BAMBIS_ROOM = 12290
 DOOR_TO_CARLAS_ROOM = 13413
@@ -120,6 +127,13 @@ BROTHEL_DOOR_1 = 11010
 BROTHEL_DOOR_2 = 11176
 BROTHEL_DOOR_3 = 11177
 
+;Kingpin residing location and room no to call him over for boxing match
+KINGPIN_HOUSE_SECTOR_X = 5
+KINGPIN_HOUSE_SECTOR_Y = 4
+KINGPIN_HOUSE_SECTOR_Z = 0
+FIRST_ROOM_IN_KINGPIN_HOUSE = 30
+LAST_ROOM_IN_KINGPIN_HOUSE = 39
+
 ;Kingpin's private stash. He will come looking for you if stolen
 KINGPIN_MONEY_SECTOR_X = 5
 KINGPIN_MONEY_SECTOR_Y = 4
@@ -192,4 +206,14 @@ MEDUNA_OUTSKIRTS_ROW_Y = 13
 ;column sectors to trigger meduna outskirts meanwhile
 MEDUNA_OUTSKIRTS_COL_X = 6
 MEDUNA_OUTSKIRTS_COL_MIN_Y = 14
-MEDUNA_OUTSKIRTS_COL_MAX_Y = 14
\ No newline at end of file
+MEDUNA_OUTSKIRTS_COL_MAX_Y = 14
+
+;add Madlab to location after scientist AWOL meanwhile scene. Set to (0, 0) if unused and LUA script to random location
+ADD_MADLAB_SECTOR_1_X = 7
+ADD_MADLAB_SECTOR_1_Y = 8
+ADD_MADLAB_SECTOR_2_X = 16
+ADD_MADLAB_SECTOR_2_Y = 8
+ADD_MADLAB_SECTOR_3_X = 11
+ADD_MADLAB_SECTOR_3_Y = 9
+ADD_MADLAB_SECTOR_4_X = 4
+ADD_MADLAB_SECTOR_4_Y = 5
\ No newline at end of file
diff --git a/gamedir/Data/Scripts/GameInit.lua b/gamedir/Data/Scripts/GameInit.lua
index 4782ab426..d4f07e75e 100644
--- a/gamedir/Data/Scripts/GameInit.lua
+++ b/gamedir/Data/Scripts/GameInit.lua
@@ -417,22 +417,22 @@ function InitNPCs()
 		i = math.random(1, 4)
 		if i == 1 then
 			--H7
-			AddAltSectorNew( 7, SectorY.MAP_ROW_H )
+			AddAltSectorNew( iniADD_MADLAB_SECTOR_1_X, iniADD_MADLAB_SECTOR_1_Y )
 		elseif i == 2 then
 			--H16
-			AddAltSectorNew( 16, SectorY.MAP_ROW_H )
+			AddAltSectorNew( iniADD_MADLAB_SECTOR_2_X, iniADD_MADLAB_SECTOR_2_Y )
 		elseif i == 3 then	
 			--I11
-			AddAltSectorNew( 11, SectorY.MAP_ROW_I )
+			AddAltSectorNew( iniADD_MADLAB_SECTOR_3_X, iniADD_MADLAB_SECTOR_3_Y )
 		elseif i == 4 then
 			--E4
-			AddAltSectorNew( 4, SectorY.MAP_ROW_E )
+			AddAltSectorNew( iniADD_MADLAB_SECTOR_4_X, iniADD_MADLAB_SECTOR_4_Y )
 		end
 	end
 	
 	if is_networked == 1 then
 		--H7
-		AddAltSectorNew( 7, SectorY.MAP_ROW_H )
+		AddAltSectorNew( iniADD_MADLAB_SECTOR_1_X, iniADD_MADLAB_SECTOR_1_Y )
 	end
 
 	-- Add Micky in random location
diff --git a/gamedir/Data/Scripts/StrategicEventHandler.lua b/gamedir/Data/Scripts/StrategicEventHandler.lua
index e54816ecf..711c7de4e 100644
--- a/gamedir/Data/Scripts/StrategicEventHandler.lua
+++ b/gamedir/Data/Scripts/StrategicEventHandler.lua
@@ -260,6 +260,8 @@ Profil =
 	CONRAD = 70,
 	KINGPIN = 86,
 	MADAME = 107,
+	JOHN = 118,
+	MARY = 119,
 }
 
 Facts = 
@@ -555,6 +557,22 @@ function HandleEarlyMorningEvents()
 		SetCharacterSectorZ (Profil.RAT,0)
 	end
 	
+	-- Does John leave country after quest completion?
+	JOHNid,JOHNx,JOHNy,JOHNz = CheckNPCinSector(Profil.JOHN)
+	if ( CheckQuest(Quests.QUEST_ESCORT_TOURISTS) == qStatus.QUESTDONE and JOHNx == 13 and JOHNy == 2 and JOHNz == 0 ) then
+		SetCharacterSectorX (Profil.JOHN,0)
+		SetCharacterSectorY (Profil.JOHN,0)
+		SetCharacterSectorZ (Profil.JOHN,0)
+	end
+	
+	-- Does Mary leave country after quest completion?
+	MARYid,MARYx,MARYy,MARYz = CheckNPCinSector(Profil.MARY)
+	if ( CheckQuest(Quests.QUEST_ESCORT_TOURISTS) == qStatus.QUESTDONE and MARYx == 13 and MARYy == 2 and MARYz == 0  ) then	
+		SetCharacterSectorX (Profil.MARY,0)
+		SetCharacterSectorY (Profil.MARY,0)
+		SetCharacterSectorZ (Profil.MARY,0)
+	end
+	
 	-- Empty money from pockets of Vince 69, Willis 80, and Jenny 132
 	SetMoneyInSoldierProfile( Profil.VINCE, 0 )
 	SetMoneyInSoldierProfile( Profil.STEVE, 0 )