diff --git a/Data-1.13/AI.ini b/Data-1.13/AI.ini
index db7fd5d82..d9b315b8d 100644
--- a/Data-1.13/AI.ini
+++ b/Data-1.13/AI.ini
@@ -17,7 +17,7 @@ NumFactories = 11
 Factory_0  = NullPlanFactory
 
 ; 'OUR_TEAM', so not really used either (?)
-Factory_1  = NullPlanFactory
+Factory_1  = LegacyAIPlanFactory
 
 ; 'ENEMY_TEAM'
 Factory_2  = LegacyAIPlanFactory
diff --git a/Data-UB/AI.ini b/Data-UB/AI.ini
index db7fd5d82..d9b315b8d 100644
--- a/Data-UB/AI.ini
+++ b/Data-UB/AI.ini
@@ -17,7 +17,7 @@ NumFactories = 11
 Factory_0  = NullPlanFactory
 
 ; 'OUR_TEAM', so not really used either (?)
-Factory_1  = NullPlanFactory
+Factory_1  = LegacyAIPlanFactory
 
 ; 'ENEMY_TEAM'
 Factory_2  = LegacyAIPlanFactory
diff --git a/Data/AI.ini b/Data/AI.ini
index db7fd5d82..d9b315b8d 100644
--- a/Data/AI.ini
+++ b/Data/AI.ini
@@ -17,7 +17,7 @@ NumFactories = 11
 Factory_0  = NullPlanFactory
 
 ; 'OUR_TEAM', so not really used either (?)
-Factory_1  = NullPlanFactory
+Factory_1  = LegacyAIPlanFactory
 
 ; 'ENEMY_TEAM'
 Factory_2  = LegacyAIPlanFactory
diff --git a/Profiles/UserProfile_JA2113/Ja2_Settings.INI b/Profiles/UserProfile_JA2113/Ja2_Settings.INI
index 08042e2e5..b08d1b172 100644
--- a/Profiles/UserProfile_JA2113/Ja2_Settings.INI
+++ b/Profiles/UserProfile_JA2113/Ja2_Settings.INI
@@ -30,7 +30,7 @@
 
 
 [JA2 Game Settings]
-bLastSavedGameSlot                       = 18
+bLastSavedGameSlot                       = 0
 ubMusicVolumeSetting                     = 65
 ubSoundEffectsVolume                     = 65
 ubSpeechVolume                           = 65
@@ -53,13 +53,13 @@ TOPTION_MERC_ALWAYS_LIGHT_UP             = TRUE
 TOPTION_SMART_CURSOR                     = FALSE
 TOPTION_SNAP_CURSOR_TO_DOOR              = TRUE
 TOPTION_GLOW_ITEMS                       = TRUE
-TOPTION_TOGGLE_TREE_TOPS                 = TRUE
+TOPTION_TOGGLE_TREE_TOPS                 = FALSE
 TOPTION_TOGGLE_WIREFRAME                 = TRUE
 TOPTION_3D_CURSOR                        = FALSE
 TOPTION_CTH_CURSOR                       = TRUE
 TOPTION_GL_BURST_CURSOR                  = TRUE
 TOPTION_ALLOW_TAUNTS                     = TRUE
-TOPTION_GL_HIGH_ANGLE                    = TRUE
+TOPTION_GL_HIGH_ANGLE                    = FALSE
 TOPTION_ALLOW_REAL_TIME_SNEAK            = FALSE
 TOPTION_SPACE_SELECTS_NEXT_SQUAD         = TRUE
 TOPTION_SHOW_ITEM_SHADOW                 = TRUE
@@ -73,26 +73,25 @@ TOPTION_SILENT_SKYRIDER                  = FALSE
 TOPTION_ENHANCED_DESC_BOX                = TRUE
 TOPTION_TOGGLE_TURN_MODE                 = FALSE
 TOPTION_STAT_PROGRESS_BARS               = TRUE
-TOPTION_ALT_MAP_COLOR			 = FALSE
+TOPTION_ALT_MAP_COLOR					  = FALSE
 TOPTION_ALTERNATE_BULLET_GRAPHICS        = TRUE
-TOPTION_SHOW_MERC_RANKS			 = FALSE
+TOPTION_SHOW_MERC_RANKS				  = FALSE
 TOPTION_SHOW_TACTICAL_FACE_GEAR          = TRUE
 TOPTION_SHOW_TACTICAL_FACE_ICONS         = TRUE
-TOPTION_DISABLE_CURSOR_SWAP		 = TRUE
-TOPTION_QUIET_TRAINING			 = FALSE
-TOPTION_QUIET_REPAIRING			 = FALSE
-TOPTION_QUIET_DOCTORING			 = FALSE
-TOPTION_AUTO_FAST_FORWARD_MODE		 = TRUE
-TOPTION_ZOMBIES				 = FALSE
-TOPTION_ENABLE_INVENTORY_POPUPS		 = TRUE
-TOPTION_SHOW_LBE_CONTENT		 = TRUE
-TOPTION_SHOW_LAST_ENEMY			 = FALSE
-TOPTION_INVERT_WHEEL			 = FALSE
+TOPTION_DISABLE_CURSOR_SWAP              = TRUE
+TOPTION_QUIET_TRAINING					  = FALSE
+TOPTION_QUIET_REPAIRING				  = FALSE
+TOPTION_QUIET_DOCTORING				  = FALSE
+TOPTION_AUTO_FAST_FORWARD_MODE           = FALSE
+TOPTION_SHOW_LAST_ENEMY				  = FALSE
+TOPTION_SHOW_LBE_CONTENT				  = TRUE
+TOPTION_INVERT_WHEEL				  = FALSE
+TOPTION_ENABLE_INVENTORY_POPUPS          = TRUE
 TOPTION_CHEAT_MODE_OPTIONS_HEADER        = FALSE
 TOPTION_FORCE_BOBBY_RAY_SHIPMENTS        = FALSE
 TOPTION_CHEAT_MODE_OPTIONS_END           = FALSE
 TOPTION_DEBUG_MODE_OPTIONS_HEADER        = FALSE
-TOPTION_REPORT_MISS_MARGIN		 = FALSE
+TOPTION_REPORT_MISS_MARGIN				  = FALSE
 TOPTION_SHOW_RESET_ALL_OPTIONS           = FALSE
 TOPTION_RESET_ALL_OPTIONS                = FALSE
 TOPTION_RETAIN_DEBUG_OPTIONS_IN_RELEASE  = FALSE