diff --git a/gamedir/Data-1.13/BinaryData/QUESTS.EDT b/gamedir/Data-1.13/BinaryData/QUESTS.EDT
new file mode 100644
index 000000000..054f971ee
Binary files /dev/null and b/gamedir/Data-1.13/BinaryData/QUESTS.EDT differ
diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index afca3749d..ad50b2c9c 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -545,7 +545,11 @@ AUTO_SAVE_ON_ASSERTION_FAILURE = TRUE
 
 AUTO_SAVE_EVERY_N_HOURS = 12
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Default setting for cheats.
+;------------------------------------------------------------------------------------------------------------------------------
 
+CHEAT_MODE = FALSE
 
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
diff --git a/gamedir/Data-1.13/Maps/J9.DAT b/gamedir/Data-1.13/Maps/J9.DAT
new file mode 100644
index 000000000..31f80ac0c
Binary files /dev/null and b/gamedir/Data-1.13/Maps/J9.DAT differ
diff --git a/gamedir/Data-1.13/Mod_Settings.ini b/gamedir/Data-1.13/Mod_Settings.ini
index e7bc43815..06f5484c7 100644
--- a/gamedir/Data-1.13/Mod_Settings.ini
+++ b/gamedir/Data-1.13/Mod_Settings.ini
@@ -98,6 +98,9 @@ INITIAL_POW_POSITION_3 = 9215
 INITIAL_POW_ITEM_POSITION_1 = 12246
 INITIAL_POW_ITEM_POSITION_2 = 12406
 INITIAL_POW_ITEM_POSITION_3 = 12086
+INITIAL_POW_GETFREE_GRIDNO_1 = 10492
+INITIAL_POW_GETFREE_GRIDNO_2 = 10482
+INITIAL_POW_GETFREE_GRIDNO_3 = 9381
 
 [Grumm]
 
@@ -106,6 +109,17 @@ INITIAL_POW_ITEM_POSITION_3 = 12086
 PRISON_SECTOR_X = 9
 PRISON_SECTOR_Y = 10
 
+;POW stuff if not yet liberated
+PRISON_POW_POSITION_1 = 12691
+PRISON_POW_POSITION_2 = 15891
+PRISON_POW_POSITION_3 = 13980
+PRISON_POW_ITEM_POSITION_1 = 10619
+PRISON_POW_ITEM_POSITION_2 = 10619
+PRISON_POW_ITEM_POSITION_3 = 10619
+PRISON_POW_GETFREE_GRIDNO_1 = 14145
+PRISON_POW_GETFREE_GRIDNO_2 = 14135
+PRISON_POW_GETFREE_GRIDNO_3 = 13646
+
 ;Dynamo captive sector for Matt's quest
 DYNAMO_CAPTIVE_SECTOR_X = 9
 DYNAMO_CAPTIVE_SECTOR_Y = 10
@@ -203,6 +217,9 @@ ADD_IGGY_SECTOR_Z = 0
 QUEEN_BASEMENT_SECTOR_X = 3
 QUEEN_BASEMENT_SECTOR_Y = 16
 QUEEN_BASEMENT_SECTOR_Z = 1
+QUEEN_ALTERNATE_SECTOR_X = 3
+QUEEN_ALTERNATE_SECTOR_Y = 16
+QUEEN_ALTERNATE_SECTOR_Z = 0
 QUEEN_ALTERNATE_GRIDNO = 11448
 
 [Chitzena]
diff --git a/gamedir/Data-1.13/Scripts/Quests.lua b/gamedir/Data-1.13/Scripts/Quests.lua
index 973170661..2dde43190 100644
--- a/gamedir/Data-1.13/Scripts/Quests.lua
+++ b/gamedir/Data-1.13/Scripts/Quests.lua
@@ -34,7 +34,7 @@ nQuests =
 	QUEST_24 = 24,							-- Start quest 48, End quest 49
 	QUEST_KILL_DEIDRANNA = 25,				-- Start quest 50, End quest 51
 	QUEST_KINGPIN_ANGEL_MARIA = 26,
-	
+	QUEST_HELD_IN_TIXA = 27,
 	-- max Quests 254
 }
 
@@ -42,6 +42,7 @@ qStatus = {
             QUESTNOTSTARTED = 0,
             QUESTINPROGRESS = 1,
             QUESTDONE = 2,
+            QUESTCANNOTSTART = 255,
           }
 		  
 Profiles = 
@@ -133,6 +134,8 @@ function InternalEndQuest( ubQuest, sSectorX, sSectorY, fUpdateHistory )
 				GiveQuestRewardPoint( sSectorX, sSectorY, 5, NO_PROFILE )	
 		elseif ( ubQuest == nQuests.QUEST_HELD_IN_ALMA ) then
 				GiveQuestRewardPoint( sSectorX, sSectorY, 5, NO_PROFILE )	
+		elseif ( ubQuest == nQuests.QUEST_HELD_IN_TIXA ) then
+				GiveQuestRewardPoint( sSectorX, sSectorY, 5, NO_PROFILE )	
 		elseif ( ubQuest == nQuests.QUEST_RUNAWAY_JOEY ) then
 				GiveQuestRewardPoint( sSectorX, sSectorY, 5, NO_PROFILE )	
 		elseif ( ubQuest == nQuests.QUEST_ESCORT_TOURISTS ) then
diff --git a/gamedir/Data-1.13/Scripts/strategicmap.lua b/gamedir/Data-1.13/Scripts/strategicmap.lua
index e9fa38a6b..a49356492 100644
--- a/gamedir/Data-1.13/Scripts/strategicmap.lua
+++ b/gamedir/Data-1.13/Scripts/strategicmap.lua
@@ -34,9 +34,10 @@ EventTypes = {
 }
 
 qStatus = {
-	QUESTNOTSTARTED =0,
+	QUESTNOTSTARTED = 0,
 	QUESTINPROGRESS = 1,
 	QUESTDONE = 2,
+	QUESTCANNOTSTART = 255,
 }
 
 Quests = 
@@ -69,6 +70,7 @@ Quests =
 	QUEST_24 = 24,							-- Start quest 48, End quest 49 - No 24 Yet
 	QUEST_KILL_DEIDRANNA = 25,				-- Start quest 50, End quest 51 - Kill Deidranna
 	QUEST_KINGPIN_ANGEL_MARIA = 26,
+	QUEST_HELD_IN_TIXA = 27,
 	
 	-- max Quests 254
 }
diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI
index 3890195d0..b0dbafde8 100644
--- a/gamedir/Data/Ja2_Options.INI
+++ b/gamedir/Data/Ja2_Options.INI
@@ -545,7 +545,11 @@ AUTO_SAVE_ON_ASSERTION_FAILURE = TRUE
 
 AUTO_SAVE_EVERY_N_HOURS = 12
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Default setting for cheats.
+;------------------------------------------------------------------------------------------------------------------------------
 
+CHEAT_MODE = FALSE
 
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
diff --git a/gamedir/Data/Maps/J9.DAT b/gamedir/Data/Maps/J9.DAT
new file mode 100644
index 000000000..31f80ac0c
Binary files /dev/null and b/gamedir/Data/Maps/J9.DAT differ
diff --git a/gamedir/Data/Mod_Settings.ini b/gamedir/Data/Mod_Settings.ini
index e7bc43815..06f5484c7 100644
--- a/gamedir/Data/Mod_Settings.ini
+++ b/gamedir/Data/Mod_Settings.ini
@@ -98,6 +98,9 @@ INITIAL_POW_POSITION_3 = 9215
 INITIAL_POW_ITEM_POSITION_1 = 12246
 INITIAL_POW_ITEM_POSITION_2 = 12406
 INITIAL_POW_ITEM_POSITION_3 = 12086
+INITIAL_POW_GETFREE_GRIDNO_1 = 10492
+INITIAL_POW_GETFREE_GRIDNO_2 = 10482
+INITIAL_POW_GETFREE_GRIDNO_3 = 9381
 
 [Grumm]
 
@@ -106,6 +109,17 @@ INITIAL_POW_ITEM_POSITION_3 = 12086
 PRISON_SECTOR_X = 9
 PRISON_SECTOR_Y = 10
 
+;POW stuff if not yet liberated
+PRISON_POW_POSITION_1 = 12691
+PRISON_POW_POSITION_2 = 15891
+PRISON_POW_POSITION_3 = 13980
+PRISON_POW_ITEM_POSITION_1 = 10619
+PRISON_POW_ITEM_POSITION_2 = 10619
+PRISON_POW_ITEM_POSITION_3 = 10619
+PRISON_POW_GETFREE_GRIDNO_1 = 14145
+PRISON_POW_GETFREE_GRIDNO_2 = 14135
+PRISON_POW_GETFREE_GRIDNO_3 = 13646
+
 ;Dynamo captive sector for Matt's quest
 DYNAMO_CAPTIVE_SECTOR_X = 9
 DYNAMO_CAPTIVE_SECTOR_Y = 10
@@ -203,6 +217,9 @@ ADD_IGGY_SECTOR_Z = 0
 QUEEN_BASEMENT_SECTOR_X = 3
 QUEEN_BASEMENT_SECTOR_Y = 16
 QUEEN_BASEMENT_SECTOR_Z = 1
+QUEEN_ALTERNATE_SECTOR_X = 3
+QUEEN_ALTERNATE_SECTOR_Y = 16
+QUEEN_ALTERNATE_SECTOR_Z = 0
 QUEEN_ALTERNATE_GRIDNO = 11448
 
 [Chitzena]