35 files changed, 1418 insertions, 1124 deletions

diff --git a/src/audio/MusicManager.cpp b/src/audio/MusicManager.cpp
index d59b3355..5c1414ad 100644
--- a/src/audio/MusicManager.cpp
+++ b/src/audio/MusicManager.cpp
@@ -1258,7 +1258,7 @@ cMusicManager::DisplayRadioStationName()
 			CFont::SetPropOn();
 			CFont::SetFontStyle(FONT_STANDARD);
 			CFont::SetCentreOn();
-			CFont::SetCentreSize(SCREEN_SCALE_X(640.0f));
+			CFont::SetCentreSize(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
 			CFont::SetColor(CRGBA(0, 0, 0, 255));
 			CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_Y(22.0f) + SCREEN_SCALE_Y(2.0f), pCurrentStation);
 
diff --git a/src/control/GameLogic.cpp b/src/control/GameLogic.cpp
index c5394e7c..573720be 100644
--- a/src/control/GameLogic.cpp
+++ b/src/control/GameLogic.cpp
@@ -380,7 +380,7 @@ CGameLogic::RestorePlayerStuffDuringResurrection(CPlayerPed *pPlayerPed, CVector
 	CStats::CheckPointReachedUnsuccessfully();
 	CWorld::Remove(pPlayerPed);
 	CWorld::Add(pPlayerPed);
-	//CHud::ResetWastedText() // TODO(MIAMI)
+	CHud::ResetWastedText();
 	CStreaming::StreamZoneModels(pos);
 	clearWaterDrop = true;
 }
diff --git a/src/control/PathFind.cpp b/src/control/PathFind.cpp
index 81d87b05..e85893e6 100644
--- a/src/control/PathFind.cpp
+++ b/src/control/PathFind.cpp
@@ -1872,8 +1872,8 @@ CPathFind::TakeWidthIntoAccountForWandering(CPathNode* nextNode, uint16 random)
 void
 CPathFind::TakeWidthIntoAccountForCoors(CPathNode* node1, CPathNode* node2, uint16 random, float* x, float* y)
 {
-	*x += (Min(node1->width, node2->width) * ((random % 16) - 7));
-	*y += (Min(node1->width, node2->width) * (((random / 16) % 16) - 7));
+	*x += (Min(node1->width, node2->width) * WIDTH_TO_PED_NODE_WIDTH * ((random % 16) - 7));
+	*y += (Min(node1->width, node2->width) * WIDTH_TO_PED_NODE_WIDTH * (((random / 16) % 16) - 7));
 }
 
 CPathNode*
diff --git a/src/control/PathFind.h b/src/control/PathFind.h
index 013d9d31..820d0b86 100644
--- a/src/control/PathFind.h
+++ b/src/control/PathFind.h
@@ -6,6 +6,7 @@ class CVehicle;
 class CPtrList;
 
 #define LANE_WIDTH 5.0f
+#define WIDTH_TO_PED_NODE_WIDTH (31.f/(500.f * 8.f))
 
 enum
 {
@@ -89,7 +90,7 @@ struct CPathNode
 	float GetZ(void) { return z/8.0f; }
 	bool HasDivider(void) { return width != 0; }
 	float GetDividerWidth(void) { return width/(2*8.0f); }
-	float GetPedNodeWidth(void) { return width*(31.f/(500.f * 8.f)); }
+	float GetPedNodeWidth(void) { return width*WIDTH_TO_PED_NODE_WIDTH; }
 	CPathNode *GetPrev(void);
 	CPathNode *GetNext(void);
 	void SetPrev(CPathNode *node);
diff --git a/src/control/Phones.cpp b/src/control/Phones.cpp
index 4f1703f2..7f8677ec 100644
--- a/src/control/Phones.cpp
+++ b/src/control/Phones.cpp
@@ -17,6 +17,8 @@
 #include "Replay.h"
 #endif
 
+// --MIAMI: file done
+
 CPhoneInfo gPhoneInfo;
 
 bool CPhoneInfo::bDisplayingPhoneMessage;  // is phone picked up
diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp
index bdfab34c..51e942d0 100644
--- a/src/core/ControllerConfig.cpp
+++ b/src/core/ControllerConfig.cpp
@@ -21,6 +21,8 @@
 #include "Camera.h"
 #include "GenericGameStorage.h"
 
+// --MIAMI: file done
+
 CControllerConfigManager ControlsManager;
 
 CControllerConfigManager::CControllerConfigManager()
@@ -314,6 +316,10 @@ void CControllerConfigManager::InitDefaultControlConfigMouse(CMouseControllerSta
 		SetMouseButtonAssociatedWithAction(PED_CYCLE_WEAPON_RIGHT,       5);
 
 		SetMouseButtonAssociatedWithAction(VEHICLE_CHANGE_RADIO_STATION, 4);
+
+		SetMouseButtonAssociatedWithAction(PED_SNIPER_ZOOM_IN, 4);
+
+		SetMouseButtonAssociatedWithAction(PED_SNIPER_ZOOM_OUT, 5);
 	}
 }
 
@@ -516,11 +522,12 @@ void CControllerConfigManager::UpdateJoyInConfigMenus_ButtonDown(int32 button, i
 			case 13:
 				pad->PCTempJoyState.DPadUp = 255;
 				break;
-#ifdef REGISTER_START_BUTTON
 			case 12:
-				pad->PCTempJoyState.Start = 255;
-				break;
+#ifndef REGISTER_START_BUTTON
+				if (padNumber == 1)
 #endif
+					pad->PCTempJoyState.Start = 255;
+				break;
 			case 11:
 				pad->PCTempJoyState.RightShock = 255;
 				break;
@@ -624,6 +631,7 @@ void CControllerConfigManager::AffectControllerStateOn_ButtonDown(int32 button,
 		if (   mode == CCam::MODE_1STPERSON
 			|| mode == CCam::MODE_SNIPER
 			|| mode == CCam::MODE_ROCKETLAUNCHER
+			|| mode == CCam::MODE_CAMERA
 			|| mode == CCam::MODE_M16_1STPERSON)
 		{
 			firstPerson = true;
@@ -1642,12 +1650,12 @@ void CControllerConfigManager::DeleteMatchingCommonControls(e_ControllerAction a
 {
 	if (!GetIsKeyBlank(key, type))
 	{
-		CLEAR_ACTION_IF_NEEDED(CAMERA_CHANGE_VIEW_ALL_SITUATIONS);
 #ifndef BIND_VEHICLE_FIREWEAPON
 		CLEAR_ACTION_IF_NEEDED(PED_FIREWEAPON);
 #endif
 		CLEAR_ACTION_IF_NEEDED(GO_LEFT);
 		CLEAR_ACTION_IF_NEEDED(GO_RIGHT);
+		CLEAR_ACTION_IF_NEEDED(CAMERA_CHANGE_VIEW_ALL_SITUATIONS);
 		CLEAR_ACTION_IF_NEEDED(NETWORK_TALK);
 		CLEAR_ACTION_IF_NEEDED(SWITCH_DEBUG_CAM_ON);
 		CLEAR_ACTION_IF_NEEDED(TOGGLE_DPAD);
@@ -1660,15 +1668,13 @@ void CControllerConfigManager::DeleteMatching3rdPersonControls(e_ControllerActio
 {
 	if (!GetIsKeyBlank(key, type))
 	{
-		CLEAR_ACTION_IF_NEEDED(PED_LOOKBEHIND);
 		CLEAR_ACTION_IF_NEEDED(PED_CYCLE_WEAPON_LEFT);
 		CLEAR_ACTION_IF_NEEDED(PED_CYCLE_WEAPON_RIGHT);
 		CLEAR_ACTION_IF_NEEDED(PED_JUMPING);
 		CLEAR_ACTION_IF_NEEDED(PED_SPRINT);
-		if (key == GetControllerKeyAssociatedWithAction(PED_DUCK, type))
-			ClearSettingsAssociatedWithAction(PED_DUCK, type);
-		if (key == GetControllerKeyAssociatedWithAction(PED_ANSWER_PHONE, type))
-			ClearSettingsAssociatedWithAction(PED_ANSWER_PHONE, type);
+		CLEAR_ACTION_IF_NEEDED(PED_LOOKBEHIND);
+		CLEAR_ACTION_IF_NEEDED(PED_DUCK);
+		CLEAR_ACTION_IF_NEEDED(PED_ANSWER_PHONE);
 
 		if (FrontEndMenuManager.m_ControlMethod == CONTROL_CLASSIC)
 		{
@@ -1707,16 +1713,15 @@ void CControllerConfigManager::DeleteMatchingVehicleControls(e_ControllerAction
 #ifdef BIND_VEHICLE_FIREWEAPON
 		CLEAR_ACTION_IF_NEEDED(VEHICLE_FIREWEAPON);
 #endif
-		CLEAR_ACTION_IF_NEEDED(VEHICLE_LOOKBEHIND);
-		CLEAR_ACTION_IF_NEEDED(VEHICLE_LOOKLEFT);
-		CLEAR_ACTION_IF_NEEDED(VEHICLE_LOOKRIGHT);
-		CLEAR_ACTION_IF_NEEDED(VEHICLE_LOOKBEHIND); // note: duplicate
-		CLEAR_ACTION_IF_NEEDED(VEHICLE_HORN);
-		CLEAR_ACTION_IF_NEEDED(VEHICLE_HANDBRAKE);
 		CLEAR_ACTION_IF_NEEDED(VEHICLE_ACCELERATE);
 		CLEAR_ACTION_IF_NEEDED(VEHICLE_BRAKE);
 		CLEAR_ACTION_IF_NEEDED(VEHICLE_CHANGE_RADIO_STATION);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_HORN);
 		CLEAR_ACTION_IF_NEEDED(TOGGLE_SUBMISSIONS);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_HANDBRAKE);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_LOOKLEFT);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_LOOKRIGHT);
+		CLEAR_ACTION_IF_NEEDED(VEHICLE_LOOKBEHIND);
 		CLEAR_ACTION_IF_NEEDED(VEHICLE_TURRETLEFT);
 		CLEAR_ACTION_IF_NEEDED(VEHICLE_TURRETRIGHT);
 		CLEAR_ACTION_IF_NEEDED(VEHICLE_TURRETUP);
@@ -1755,36 +1760,36 @@ void CControllerConfigManager::DeleteMatchingActionInitiators(e_ControllerAction
 			DeleteMatching1rst3rdPersonControls    (action, key, type);
 			break;
 		case ACTIONTYPE_3RDPERSON:
-			DeleteMatching3rdPersonControls        (action, key, type);
 			DeleteMatchingCommonControls           (action, key, type);
-			DeleteMatchingVehicle_3rdPersonControls(action, key, type);
 			DeleteMatching1rst3rdPersonControls    (action, key, type);
+			DeleteMatching3rdPersonControls        (action, key, type);
+			DeleteMatchingVehicle_3rdPersonControls(action, key, type);
 			break;
 		case ACTIONTYPE_VEHICLE:
-			DeleteMatchingVehicleControls          (action, key, type);
 			DeleteMatchingCommonControls           (action, key, type);
+			DeleteMatchingVehicleControls          (action, key, type);
 			DeleteMatchingVehicle_3rdPersonControls(action, key, type);
 			break;
 		case ACTIONTYPE_VEHICLE_3RDPERSON:
-			DeleteMatching3rdPersonControls        (action, key, type);
-			DeleteMatchingVehicleControls          (action, key, type);
 			DeleteMatchingCommonControls           (action, key, type);
 			DeleteMatching1rst3rdPersonControls    (action, key, type);
-			break;
-		case ACTIONTYPE_1RST3RDPERSON:
-			DeleteMatching1rstPersonControls       (action, key, type);
 			DeleteMatching3rdPersonControls        (action, key, type);
-			DeleteMatchingCommonControls           (action, key, type);
-			DeleteMatchingVehicle_3rdPersonControls(action, key, type);
-			DeleteMatching1rst3rdPersonControls    (action, key, type);
+			DeleteMatchingVehicleControls          (action, key, type);
 			break;
 		case ACTIONTYPE_COMMON:
+			DeleteMatchingCommonControls           (action, key, type);
 			DeleteMatching1rstPersonControls       (action, key, type);
+			DeleteMatching1rst3rdPersonControls    (action, key, type);
 			DeleteMatching3rdPersonControls        (action, key, type);
 			DeleteMatchingVehicleControls          (action, key, type);
 			DeleteMatchingVehicle_3rdPersonControls(action, key, type);
+			break;
+		case ACTIONTYPE_1RST3RDPERSON:
 			DeleteMatchingCommonControls           (action, key, type);
+			DeleteMatching1rstPersonControls       (action, key, type);
 			DeleteMatching1rst3rdPersonControls    (action, key, type);
+			DeleteMatching3rdPersonControls        (action, key, type);
+			DeleteMatchingVehicle_3rdPersonControls(action, key, type);
 			break;
 		default: break;
 		}
@@ -1850,15 +1855,15 @@ e_ControllerActionType CControllerConfigManager::GetActionType(e_ControllerActio
 #ifdef BIND_VEHICLE_FIREWEAPON
 	case VEHICLE_FIREWEAPON:
 #endif
-	case VEHICLE_LOOKBEHIND:
-	case VEHICLE_LOOKLEFT:
-	case VEHICLE_LOOKRIGHT:
-	case VEHICLE_HORN:
-	case VEHICLE_HANDBRAKE:
 	case VEHICLE_ACCELERATE:
 	case VEHICLE_BRAKE:
 	case VEHICLE_CHANGE_RADIO_STATION:
+	case VEHICLE_HORN:
 	case TOGGLE_SUBMISSIONS:
+	case VEHICLE_HANDBRAKE:
+	case VEHICLE_LOOKLEFT:
+	case VEHICLE_LOOKRIGHT:
+	case VEHICLE_LOOKBEHIND:
 	case VEHICLE_TURRETLEFT:
 	case VEHICLE_TURRETRIGHT:
 	case VEHICLE_TURRETUP:
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 6768b901..eee8b4b2 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -54,7 +54,7 @@ CRGBA SLIDERON_COLOR(97, 194, 247, 255);
 CRGBA SLIDEROFF_COLOR(27, 89, 130, 255);
 CRGBA LIST_BACKGROUND_COLOR(49, 101, 148, 255);
 
-#define TIDY_UP_PBP // ProcessButtonPresses
+#define TIDY_UP_PBP // ProcessUserInput
 #define MAX_VISIBLE_LIST_ROW 30
 #define SCROLLBAR_MAX_HEIGHT 263.0f // not in end result
 
@@ -77,28 +77,11 @@ CRGBA LIST_BACKGROUND_COLOR(49, 101, 148, 255);
 #define GetBackJustDown GetSquareJustDown
 #endif
 
-
-#ifdef PS2_LIKE_MENU
-BottomBarOption bbNames[8];
-int bbTabCount = 0;
-bool bottomBarActive = false;
-bool reverseAlpha = false;
-int pendingScreen = -1;
-int pendingOption = -1;
-int curBottomBarOption = -1;
-int hoveredBottomBarOption = -1;
-#endif
-
 #ifdef CUTSCENE_BORDERS_SWITCH
 bool CMenuManager::m_PrefsCutsceneBorders = true;
 #endif
 
-// Originally that was PS2 option color, they forget it here and used in PrintBriefs once(but didn't use the output anyway)
-#ifdef PS2_LIKE_MENU
-const CRGBA TEXT_COLOR = CRGBA(150, 110, 30, 255);
-#else
-const CRGBA TEXT_COLOR = CRGBA(235, 170, 50, 255); // PC briefs text color
-#endif
+const CRGBA TEXT_COLOR = CRGBA(150, 110, 30, 255); // TODO(Miami): is this still here?
 
 float MENU_TEXT_SIZE_X = SMALLTEXT_X_SCALE;
 float MENU_TEXT_SIZE_Y = SMALLTEXT_Y_SCALE;
@@ -153,28 +136,15 @@ const char* FrontendFilenames[][2] = {
 	{"upOn", "buttonA"}
 };
 
+#define MENU_X_RIGHT_ALIGNED(x) SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH - (x))
+
 #ifdef ASPECT_RATIO_SCALE
 // All of the defines below replace the StretchX function. Otherwise use SCREEN_SCALE_X.
-#define MENU_X_LEFT_ALIGNED(x) ScaleAndCenterX(x)
-#define MENU_X_RIGHT_ALIGNED(x) ScaleAndCenterX(DEFAULT_SCREEN_WIDTH - (x))
+#define MENU_X_LEFT_ALIGNED(x) SCALE_AND_CENTER_X(x)
 #define MENU_X(x) SCREEN_SCALE_X(x)
 #define MENU_Y(y) SCREEN_SCALE_Y(y)
-float
-ScaleAndCenterX(float x)
-{
-	if (SCREEN_WIDTH == DEFAULT_SCREEN_WIDTH)
-		return x;
-	else {
-		if (x > DEFAULT_SCREEN_WIDTH / 2) {
-			return SCREEN_WIDTH / 2 + SCREEN_SCALE_X(x - DEFAULT_SCREEN_WIDTH / 2);
-		} else {
-			return SCREEN_WIDTH / 2 - SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH / 2 - x);
-		}
-	}
-}
 #else
 #define MENU_X_LEFT_ALIGNED(x) StretchX(x)
-#define MENU_X_RIGHT_ALIGNED(x) SCREEN_STRETCH_FROM_RIGHT(x)
 #define MENU_X(x) StretchX(x)
 #define MENU_Y(y) StretchY(y)
 #endif
@@ -314,33 +284,6 @@ CMenuManager::GetPreviousPageOption()
 bool DoRWStuffStartOfFrame(int16 TopRed, int16 TopGreen, int16 TopBlue, int16 BottomRed, int16 BottomGreen, int16 BottomBlue, int16 Alpha);
 void DoRWStuffEndOfFrame(void);
 
-#ifdef PS2_LIKE_MENU
-void
-CMenuManager::SwitchToNewScreen(int8 screen)
-{
-	if (reverseAlpha) {
-			m_nPrevScreen = m_nCurrScreen;
-			m_nCurrScreen = pendingScreen;
-			m_nCurrOption = pendingOption;
-			reverseAlpha = false;
-			if (updateDelay)
-				m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
-	}
-	if (withReverseAlpha) {
-		pendingOption = option;
-		pendingScreen = screen;
-		reverseAlpha = true;
-	} else {
-		m_nPrevScreen = m_nCurrScreen;
-		m_nCurrScreen = screen;
-		m_nCurrOption = option;
-		if (updateDelay)
-			m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
-	}
-	m_nMenuFadeAlpha = 255;
-}
-#else
-
 // --MIAMI: Done
 void
 CMenuManager::SwitchToNewScreen(int8 screen)
@@ -381,7 +324,6 @@ CMenuManager::SwitchToNewScreen(int8 screen)
 	m_nOptionHighlightTransitionBlend = 0;
 	m_LastScreenSwitch = CTimer::GetTimeInMillisecondsPauseMode();
 }
-#endif
 
 CMenuManager::CMenuManager()
 {
@@ -815,11 +757,7 @@ void
 CMenuManager::DrawStandardMenus(bool activeScreen)
 {
 	float nextYToUse = 0.0f; // III leftover, set but unused in VC
-#ifdef PS2_LIKE_MENU
-	bool itemsAreSelectable = !bottomBarActive;
-#else
 	bool itemsAreSelectable = true;
-#endif
 	CFont::SetBackgroundOff();
 	CFont::SetPropOn();
 	CFont::SetCentreOff();
@@ -2062,36 +2000,6 @@ CMenuManager::DrawFrontEnd()
 	SetFrontEndRenderStates();
 	m_NoEmptyBinding = true;
 
-#ifdef PS2_LIKE_MENU
-	if (m_nCurrScreen == MENUPAGE_NONE) {
-		if (m_bGameNotLoaded) {
-			if (bbTabCount != 6) {
-				bbNames[0] = { "FEB_SAV",MENUPAGE_NEW_GAME };
-				bbNames[1] = { "FEB_CON",MENUPAGE_CONTROLLER_PC };
-				bbNames[2] = { "FEB_AUD",MENUPAGE_SOUND_SETTINGS };
-				bbNames[3] = { "FEB_DIS",MENUPAGE_DISPLAY_SETTINGS };
-				bbNames[4] = { "FEB_LAN",MENUPAGE_LANGUAGE_SETTINGS };
-				bbNames[5] = { "FESZ_QU",MENUPAGE_EXIT };
-				bbTabCount = 6;
-			}
-		} else {
-			if (bbTabCount != 8) {
-				bbNames[0] = { "FEB_STA",MENUPAGE_STATS };
-				bbNames[1] = { "FEB_SAV",MENUPAGE_NEW_GAME };
-				bbNames[2] = { "FEB_BRI",MENUPAGE_BRIEFS };
-				bbNames[3] = { "FEB_CON",MENUPAGE_CONTROLLER_PC };
-				bbNames[4] = { "FEB_AUD",MENUPAGE_SOUND_SETTINGS };
-				bbNames[5] = { "FEB_DIS",MENUPAGE_DISPLAY_SETTINGS };
-				bbNames[6] = { "FEB_LAN",MENUPAGE_LANGUAGE_SETTINGS };
-				bbNames[7] = { "FESZ_QU",MENUPAGE_EXIT };
-				bbTabCount = 8;
-			}
-		}
-		m_nCurrScreen = bbNames[0].screenId;
-		bottomBarActive = true;
-		curBottomBarOption = 0;
-	}
-#else
 	if (m_nCurrScreen == MENUPAGE_NONE) {
 		if (m_bGameNotLoaded) {
 			m_nCurrScreen = MENUPAGE_START_MENU;
@@ -2099,7 +2007,6 @@ CMenuManager::DrawFrontEnd()
 			m_nCurrScreen = MENUPAGE_PAUSE_MENU;
 		}
 	}
-#endif
 
 	if (m_nCurrOption == 0 && aScreens[m_nCurrScreen].m_aEntries[0].m_Action == MENUACTION_LABEL)
 		m_nCurrOption = 1;
@@ -2110,200 +2017,6 @@ CMenuManager::DrawFrontEnd()
 	DrawBackground(false);
 }
 
-#ifdef PS2_LIKE_MENU
-void
-CMenuManager::DrawBackground()
-{
-	CSprite2d::InitPerFrame();
-	CFont::InitPerFrame();
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
-
-	if (!m_bGameNotLoaded) {
-		CSprite2d *bg = LoadSplash(nil);
-		bg->Draw(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255));
-	} else {
-		CSprite2d::DrawRect(CRect(0.0f, 0.0f, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, 255));
-	}
-
-
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
-	RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
-	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-	m_aFrontEndSprites[FE2_MAINPANEL_UL].Draw(CRect(MENU_X_LEFT_ALIGNED(0.0f), 0.0f, SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2), CRGBA(255, 255, 255, 255));
-	m_aFrontEndSprites[FE2_MAINPANEL_UR].Draw(CRect(SCREEN_WIDTH / 2, 0.0f, MENU_X_RIGHT_ALIGNED(0.0f), SCREEN_HEIGHT / 2), CRGBA(255, 255, 255, 255));
-	m_aFrontEndSprites[FE2_MAINPANEL_DL].Draw(CRect(MENU_X_LEFT_ALIGNED(0.0f), SCREEN_HEIGHT / 2, SCREEN_WIDTH / 2, SCREEN_HEIGHT), CRGBA(255, 255, 255, 255));
-	m_aFrontEndSprites[FE2_MAINPANEL_DR].Draw(CRect(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2, MENU_X_RIGHT_ALIGNED(0.0f), SCREEN_HEIGHT), CRGBA(255, 255, 255, 255));
-	
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
-	eFrontendSprites currentSprite;
-	switch (m_nCurrScreen) {
-		case MENUPAGE_STATS:
-		case MENUPAGE_START_MENU:
-		case MENUPAGE_PAUSE_MENU:
-		case MENUPAGE_EXIT:
-			currentSprite = FE_ICONSTATS;
-			break;
-		case MENUPAGE_LANGUAGE_SETTINGS:
-			currentSprite = FE_ICONLANGUAGE;
-			break;
-		case MENUPAGE_CHOOSE_LOAD_SLOT:
-		case MENUPAGE_CHOOSE_DELETE_SLOT:
-		case MENUPAGE_NEW_GAME_RELOAD:
-		case MENUPAGE_LOAD_SLOT_CONFIRM:
-		case MENUPAGE_DELETE_SLOT_CONFIRM:
-			currentSprite = FE_ICONSAVE;
-			break;
-		case MENUPAGE_DISPLAY_SETTINGS:
-			currentSprite = FE_ICONDISPLAY;
-			break;
-		case MENUPAGE_SOUND_SETTINGS:
-			currentSprite = FE_ICONAUDIO;
-			break;
-		case MENUPAGE_CONTROLLER_PC:
-		case MENUPAGE_OPTIONS:
-		case MENUPAGE_CONTROLLER_SETTINGS:
-		case MENUPAGE_KEYBOARD_CONTROLS:
-		case MENUPAGE_MOUSE_CONTROLS:
-			currentSprite = FE_ICONCONTROLS;
-			break;
-		default:
-			/*case MENUPAGE_NEW_GAME: */
-			/*case MENUPAGE_BRIEFS: */
-			currentSprite = FE_ICONBRIEF;
-			break;
-	}
-
-	m_aFrontEndSprites[currentSprite].Draw(CRect(MENU_X_LEFT_ALIGNED(50.0f), MENU_Y(50.0f), MENU_X_RIGHT_ALIGNED(50.0f), SCREEN_SCALE_FROM_BOTTOM(95.0f)), CRGBA(255, 255, 255, m_nMenuFadeAlpha > 255 ? 255 : m_nMenuFadeAlpha));
-
-	static float fadeAlpha = 0.0f;
-	static int lastState = 0;
-
-	// reverseAlpha = PS2 fading (wait for 255->0, then change screen)
-	if (m_nMenuFadeAlpha < 255) {
-		if (lastState == 1 && !reverseAlpha)
-			fadeAlpha = 0.f;
-
-		if (m_nMenuFadeAlpha <= 0 && reverseAlpha) {
-			reverseAlpha = false;
-			ChangeScreen(pendingScreen, pendingOption, true, false);
-		} else {
-			// +20 per every 33 ms (1000.f/30.f - original frame limiter fps)
-			if (!reverseAlpha)
-				fadeAlpha += (frameTime) * 20.f / 33.f;
-			else
-				fadeAlpha = max(0.0f, fadeAlpha - (frameTime) * 30.f / 33.f);
-
-			m_nMenuFadeAlpha = fadeAlpha;
-		} 
-		lastState = 0;
-	} else {
-		if (lastState == 0) fadeAlpha = 255.f;
-
-		if (reverseAlpha) {
-			fadeAlpha -= (frameTime) * 30.f / 33.f;
-
-			m_nMenuFadeAlpha = fadeAlpha;
-		}
-		lastState = 1;
-
-		// TODO: what is this? waiting mouse?
-		if(field_518 == 4){
-			if(m_nHoverOption == HOVEROPTION_3 || m_nHoverOption == HOVEROPTION_4 ||
-				m_nHoverOption == HOVEROPTION_5 || m_nHoverOption == HOVEROPTION_6 || m_nHoverOption == HOVEROPTION_7)
-
-				field_518 = 2;
-			else
-				field_518 = 1;
-		}
-	}
-
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-	switch (m_nCurrScreen) {
-		case MENUPAGE_SKIN_SELECT:
-			DrawPlayerSetupScreen();
-			break;
-		case MENUPAGE_KEYBOARD_CONTROLS:
-			DrawControllerSetupScreen();
-			break;
-		default:
-			DrawStandardMenus();
-			break;
-	}
-
-	#define optionWidth		MENU_X(66.0f)
-	#define rawOptionHeight	22.0f
-	#define optionBottom	SCREEN_SCALE_FROM_BOTTOM(20.0f)
-	#define optionTop		SCREEN_SCALE_FROM_BOTTOM(20.0f + rawOptionHeight)
-	#define leftPadding		MENU_X_LEFT_ALIGNED(90.0f)
-	wchar *str;
-	hoveredBottomBarOption = -1;
-	if (curBottomBarOption != -1) {
-
-		// This active tab sprite is needlessly big
-		m_aFrontEndSprites[FE2_TABACTIVE].Draw(CRect(leftPadding - MENU_X(2.0f) + (optionWidth) * curBottomBarOption, optionTop,
-			leftPadding - MENU_X(5.0f) + optionWidth * (curBottomBarOption + 2), optionBottom + MENU_Y(rawOptionHeight - 9.0f)),
-			CRGBA(CRGBA(255, 255, 255, 255)));
-
-		for (int i = 0; i < bbTabCount; i++) {
-			float xStart = leftPadding + optionWidth * i;
-			if (CheckHover(xStart, xStart + optionWidth, optionTop, optionBottom))
-				hoveredBottomBarOption = i;
-
-			CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-			CFont::SetScale(MENU_X(0.35f), MENU_Y(0.7f));
-			CFont::SetRightJustifyOff();
-			if (hoveredBottomBarOption == i && hoveredBottomBarOption != curBottomBarOption)
-				CFont::SetColor(CRGBA(235, 170, 50, 255));
-			else {
-				if(bottomBarActive || curBottomBarOption == i)
-					CFont::SetColor(CRGBA(0, 0, 0, 255));
-				else
-					CFont::SetColor(CRGBA(0, 0, 0, 110));
-			}
-
-			str = TheText.Get(bbNames[i].name);
-			
-			CFont::PrintString(xStart + MENU_X(4.0f), SCREEN_SCALE_FROM_BOTTOM(39.0f), str);
-			
-		}
-	}
-	#undef optionBottom
-	#undef optionTop
-	#undef leftPadding
-	#undef optionWidth
-	#undef rawOptionHeight
-
-	CFont::DrawFonts();
-
-	// Draw mouse
-	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERLINEAR);
-	RwRenderStateSet(rwRENDERSTATETEXTUREADDRESS, (void*)rwTEXTUREADDRESSCLAMP);
-	if (m_bShowMouse) {
-		RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
-		RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
-
-		CRect mouse(0.0f, 0.0f, MENU_X(75.0f), MENU_Y(75.0f));
-		CRect shad(MENU_X(10.0f), MENU_Y(3.0f), MENU_X(85.0f), MENU_Y(78.0f));
-
-		mouse.Translate(m_nMousePosX, m_nMousePosY);
-		shad.Translate(m_nMousePosX, m_nMousePosY);
-		if(field_518 == 4){
-			m_aFrontEndSprites[MENUSPRITE_MOUSET].Draw(shad, CRGBA(100, 100, 100, 50));
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aFrontEndSprites[MENUSPRITE_MOUSET].Draw(mouse, CRGBA(255, 255, 255, 255));
-		}else{
-			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(shad, CRGBA(100, 100, 100, 50));
-			RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
-			m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
-		}
-	}
-}
-#else
-
 // --MIAMI: Done except commented things
 void
 CMenuManager::DrawBackground(bool transitionCall)
@@ -2527,7 +2240,6 @@ CMenuManager::DrawBackground(bool transitionCall)
 		m_aFrontEndSprites[MENUSPRITE_MOUSE].Draw(mouse, CRGBA(255, 255, 255, 255));
 	}
 }
-#endif
 
 void
 CMenuManager::DrawPlayerSetupScreen(bool activeScreen)
@@ -3825,7 +3537,7 @@ CMenuManager::UserInput(void)
 	if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS || m_nCurrScreen == MENUPAGE_SKIN_SELECT) {
 		ProcessList(optionSelected, goBack);
 	} else {
-		// TODO(Miami): Seperate that code into a new function from ProcessButtonPresses
+		// TODO(Miami): Seperate that code into a new function from ProcessUserInput
 		// ProcessScrollingExceptLists(goBack);
 
 		if (m_AllowNavigation &&
@@ -3858,19 +3570,13 @@ CMenuManager::UserInput(void)
 		if (CPad::GetPad(0)->GetLeftMouseJustUp() && m_nCurrScreen != MENUPAGE_MAP) {
 			// TODO(Miami): New radio selector
 			if (m_nHoverOption == HOVEROPTION_RANDOM_ITEM) {
-				m_nCurrOption = m_nOptionMouseHovering;
 				optionSelected = true;
 			}
 		}
 		// TODO(Miami): This part is old radio selector, remove when new is reversed!!
 		else if (CPad::GetPad(0)->GetLeftMouseJustDown()) {
 			if (m_nHoverOption >= HOVEROPTION_RADIO_0 && m_nHoverOption <= HOVEROPTION_RADIO_9) {
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-				m_PrefsRadioStation = m_nHoverOption - HOVEROPTION_RADIO_0;
-				SaveSettings();
-				DMAudio.SetRadioInCar(m_PrefsRadioStation);
-				DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
-				OutputDebugString("FRONTEND RADIO STATION CHANGED");
+				ChangeRadioStation(m_nHoverOption - HOVEROPTION_RADIO_0 - m_PrefsRadioStation);
 			}
 		}
 
@@ -3909,7 +3615,7 @@ CMenuManager::UserInput(void)
 
 		}
 		if (CPad::GetPad(0)->GetBackJustDown() || CPad::GetPad(0)->GetEscapeJustDown()) {
-			if (m_nCurrScreen != MENUPAGE_NONE && m_nCurrScreen != MENUPAGE_PAUSE_MENU && m_nCurrScreen != MENUPAGE_CHOOSE_SAVE_SLOT
+			if (m_nCurrScreen != MENUPAGE_START_MENU && m_nCurrScreen != MENUPAGE_PAUSE_MENU && m_nCurrScreen != MENUPAGE_CHOOSE_SAVE_SLOT
 				&& m_nCurrScreen != MENUPAGE_SAVE_CHEAT_WARNING && m_nCurrScreen != MENUPAGE_SAVING_IN_PROGRESS
 				&& m_nCurrScreen != MENUPAGE_DELETING_IN_PROGRESS && m_nCurrScreen != MENUPAGE_OUTRO)
 			{
@@ -3983,13 +3689,12 @@ CMenuManager::UserInput(void)
 			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
 		}
 	}
-	ProcessButtonPresses(goDown, goUp, optionSelected, goBack, changeValueBy);
+	ProcessUserInput(goDown, goUp, optionSelected, goBack, changeValueBy);
 }
 
-// TODO(Miami)
-// Also rename it to ProcessUserInput when it's done
+// --MIAMI: Done except TODOs
 void
-CMenuManager::ProcessButtonPresses(uint8 goDown, uint8 goUp, uint8 optionSelected, uint8 goBack, int8 changeAmount)
+CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, uint8 goBack, int8 changeAmount)
 {
 	if (m_nCurrScreen == MENUPAGE_OUTRO)
 		return;
@@ -4012,7 +3717,10 @@ CMenuManager::ProcessButtonPresses(uint8 goDown, uint8 goUp, uint8 optionSelecte
 				MouseButtonJustClicked = 4;
 			else if (CPad::GetPad(0)->GetMouseWheelDownJustUp())
 				MouseButtonJustClicked = 5;
-			// TODO two more buttons
+			else if (CPad::GetPad(0)->GetMouseX1JustUp())
+				MouseButtonJustClicked = 6;
+			else if (CPad::GetPad(0)->GetMouseX2JustUp())
+				MouseButtonJustClicked = 7;
 
 			JoyButtonJustClicked = ControlsManager.GetJoyButtonJustDown();
 
@@ -4072,45 +3780,6 @@ CMenuManager::ProcessButtonPresses(uint8 goDown, uint8 goUp, uint8 optionSelecte
 	}
 #endif
 
-#ifdef PS2_LIKE_MENU
-	if (CPad::GetPad(0)->GetLeftMouseJustDown() && hoveredBottomBarOption != -1) {
-		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
-		bottomBarActive = false;
-		curBottomBarOption = hoveredBottomBarOption;
-		ChangeScreen(bbNames[curBottomBarOption].screenId, 0, true, false);
-		return;
-	} else if (bottomBarActive) {
-		if (CPad::GetPad(0)->GetEnterJustDown() || CPad::GetPad(0)->GetCrossJustDown()) {
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
-			bottomBarActive = false;
-
-			// If there's a menu change with fade ongoing, finish it now
-			if (reverseAlpha)
-				m_nMenuFadeAlpha = 0;
-			return;
-		} else if (CPad::GetPad(0)->GetLeftJustDown() || CPad::GetPad(0)->GetAnaloguePadLeft() || CPad::GetPad(0)->GetDPadLeftJustDown()
-			|| CPad::GetPad(0)->GetUpJustDown() || CPad::GetPad(0)->GetAnaloguePadUp() || CPad::GetPad(0)->GetDPadUpJustDown()) {
-			m_bShowMouse = false;
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
-			if (curBottomBarOption > 0)
-				curBottomBarOption--;
-			ChangeScreen(bbNames[curBottomBarOption].screenId, 0, true, true);
-			return;
-		} else if (CPad::GetPad(0)->GetRightJustDown() || CPad::GetPad(0)->GetAnaloguePadRight() || CPad::GetPad(0)->GetDPadRightJustDown()
-			|| CPad::GetPad(0)->GetDownJustDown() || CPad::GetPad(0)->GetAnaloguePadDown() || CPad::GetPad(0)->GetDPadDownJustDown()) {
-			m_bShowMouse = false;
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
-			if (curBottomBarOption < bbTabCount-1)
-				curBottomBarOption++;
-			ChangeScreen(bbNames[curBottomBarOption].screenId, 0, true, true);
-			return;
-		}
-		optionSelected = false;
-		goDown = false;
-		goUp = false;
-	}
-#endif
-
 	int oldOption = m_nCurrOption;
 	if (goDown) {
 		if (m_nCurrScreen != MENUPAGE_MAP)
@@ -4139,435 +3808,327 @@ CMenuManager::ProcessButtonPresses(uint8 goDown, uint8 goUp, uint8 optionSelecte
 			m_nOptionHighlightTransitionBlend = 0;
 	}
 
-	if (optionSelected) {
-		int option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action;
-		if (option == MENUACTION_CHANGEMENU || option == MENUACTION_POPULATESLOTS_CHANGEMENU || option == MENUACTION_GOBACK
-			|| option == MENUACTION_YES || option == MENUACTION_NO) {
-			if (strncmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FEDS_TB", 8) != 0 &&
-				strncmp(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_EntryName, "FESZ_CA", 8) != 0) {
-
-				if (m_nCurrScreen == MENUPAGE_CHOOSE_DELETE_SLOT) {
-					if (Slots[m_nCurrOption] != SLOT_OK)
-						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_BACK, 0);
-					else
-						DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
-				} else
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
-			} else {
-				// This is duplicate, back button already processed below
-#ifndef TIDY_UP_PBP
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_EXIT, 0);
-				if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS) {
-					DMAudio.StopFrontEndTrack();
-					OutputDebugString("FRONTEND AUDIO TRACK STOPPED");
-				}
-#endif
-			}
-		} else if (option == MENUACTION_CHECKSAVE) {
-			if (Slots[aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot - 1] == SLOT_EMPTY) {
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
-			} else {
-				if (m_nCurrScreen != MENUPAGE_NEW_GAME_RELOAD) {
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-				}
-			}
-		} else if (option != MENUACTION_CHANGEMENU && option != MENUACTION_BRIGHTNESS && option != MENUACTION_DRAWDIST
-			&& option != MENUACTION_MUSICVOLUME && option != MENUACTION_SFXVOLUME
-			&& option != MENUACTION_CHECKSAVE && option != MENUACTION_MOUSESENS
-			&& option != MENUACTION_YES && option != MENUACTION_NO
-			&& option != MENUACTION_SCREENRES) {
-
-			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-		}
-
-		if ((m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) || (m_nCurrScreen == MENUPAGE_SKIN_SELECT)) {
+	if (optionSelected && m_nMenuFadeAlpha == 255) {
+		if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu == MENUPAGE_NEW_GAME_RELOAD && m_bGameNotLoaded) {
+			DoSettingsBeforeStartingAGame();
+		} else if ((m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) || (m_nCurrScreen == MENUPAGE_SKIN_SELECT)) {
 			switch (m_nCurrExLayer) {
-				default:
-					goBack = true;
-					break;
-				case HOVEROPTION_LIST:
-					if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
-						m_bWaitingForNewKeyBind = true;
-						m_bStartWaitingForKeyBind = true;
-						pControlEdit = &m_KeyPressedCode;
-					}
-					if (m_nCurrScreen == MENUPAGE_SKIN_SELECT) {
-						strcpy(m_PrefsSkinFile, m_aSkinName);
-						CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
-						m_nCurrExLayer = HOVEROPTION_BACK;
-						SaveSettings();
-					}
-					m_nHoverOption = HOVEROPTION_NOT_HOVERING;
-					break;
-				case HOVEROPTION_USESKIN:
-					m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+			case HOVEROPTION_LIST:
+				if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
+					m_bWaitingForNewKeyBind = true;
+					m_bStartWaitingForKeyBind = true;
+					pControlEdit = &m_KeyPressedCode;
+				}
+				if (m_nCurrScreen == MENUPAGE_SKIN_SELECT) {
 					strcpy(m_PrefsSkinFile, m_aSkinName);
 					CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
 					m_nCurrExLayer = HOVEROPTION_BACK;
 					SaveSettings();
-					break;
+				}
+				m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+				break;
+			case HOVEROPTION_USESKIN:
+				m_nHoverOption = HOVEROPTION_NOT_HOVERING;
+				strcpy(m_PrefsSkinFile, m_aSkinName);
+				CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
+				m_nCurrExLayer = HOVEROPTION_BACK;
+				SaveSettings();
+				break;
+			case HOVEROPTION_BACK:
+			default:
+				goBack = true;
+				break;
 			}
-		} else if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu == MENUPAGE_NEW_GAME_RELOAD && m_bGameNotLoaded) {
-			DoSettingsBeforeStartingAGame();
-/*		} else if (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS) {
-			// .. either empty or there was some outer if. :shrug: pointless anyway, keyboard_controls is handled in first if.
-*/
-		} else if (m_nCurrScreen == MENUPAGE_SKIN_SELECT) {
 			if (m_nSkinsTotal > 0) {
 				m_pSelectedSkin = m_pSkinListHead.nextSkin;
 				strcpy(m_PrefsSkinFile, m_aSkinName);
 				CWorld::Players[0].SetPlayerSkin(m_PrefsSkinFile);
 				SaveSettings();
-			} else {
-				SwitchToNewScreen(-2);
 			}
-		} else {
-			option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action;
-			switch (option) {
-				case MENUACTION_RADIO:
-					++m_PrefsRadioStation;
-					if (DMAudio.IsMP3RadioChannelAvailable()) {
-						if (m_PrefsRadioStation > USERTRACK)
-							m_PrefsRadioStation = WILDSTYLE;
-					} else if (m_PrefsRadioStation > WAVE) {
-						m_PrefsRadioStation = USERTRACK;
-					}
-					SaveSettings();
-					DMAudio.SetRadioInCar(m_PrefsRadioStation);
-					DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
-					OutputDebugString("FRONTEND RADIO STATION CHANGED");
-					break;
-				case MENUACTION_LANG_ENG:
-					m_PrefsLanguage = LANGUAGE_AMERICAN;
-					m_bFrontEnd_ReloadObrTxtGxt = true;
-					InitialiseChangedLanguageSettings();
-					SaveSettings();
-					break;
-				case MENUACTION_LANG_FRE:
-					m_PrefsLanguage = LANGUAGE_FRENCH;
-					m_bFrontEnd_ReloadObrTxtGxt = true;
-					InitialiseChangedLanguageSettings();
-					SaveSettings();
-					break;
-				case MENUACTION_LANG_GER:
-					m_PrefsLanguage = LANGUAGE_GERMAN;
-					m_bFrontEnd_ReloadObrTxtGxt = true;
-					InitialiseChangedLanguageSettings();
-					SaveSettings();
-					break;
-				case MENUACTION_LANG_ITA:
-					m_PrefsLanguage = LANGUAGE_ITALIAN;
-					m_bFrontEnd_ReloadObrTxtGxt = true;
-					InitialiseChangedLanguageSettings();
-					SaveSettings();
-					break;
-				case MENUACTION_LANG_SPA:
-					m_PrefsLanguage = LANGUAGE_SPANISH;
-					m_bFrontEnd_ReloadObrTxtGxt = true;
-					InitialiseChangedLanguageSettings();
-					SaveSettings();
-					break;
-				case MENUACTION_POPULATESLOTS_CHANGEMENU:
-					PcSaveHelper.PopulateSlotInfo();
+		}
 
-					// fall through
-				case MENUACTION_CHANGEMENU:
-				case MENUACTION_YES:
-				case MENUACTION_NO:
-				{
+		int option = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action;
+		switch (option) {
+			case MENUACTION_CHANGEMENU:
+			case MENUACTION_YES:
+			case MENUACTION_NO:
 #ifdef CUSTOM_MAP
-					if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu == MENUPAGE_MAP) {
-						bMapLoaded = false;
-					}
-
-#endif
-					SwitchToNewScreen(0);
-					break;
-				}
-				case MENUACTION_GOBACK:
-					goBack = true;
-					break;
-				case MENUACTION_CHECKSAVE:
-				{
-					int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
-
-					if (saveSlot >= 2 && saveSlot <= 9) {
-						m_nCurrSaveSlot = saveSlot - 2;
-						if (Slots[m_nCurrSaveSlot] != SLOT_EMPTY && Slots[m_nCurrSaveSlot] != SLOT_CORRUPTED) {
-							if (m_nCurrScreen == MENUPAGE_CHOOSE_LOAD_SLOT) {
-								SwitchToNewScreen(MENUPAGE_LOAD_SLOT_CONFIRM);
-							} else if (m_nCurrScreen == MENUPAGE_CHOOSE_DELETE_SLOT) {
-								SwitchToNewScreen(MENUPAGE_DELETE_SLOT_CONFIRM);
-							}
-						}
-					}
-					break;
+				if (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu == MENUPAGE_MAP) {
+					bMapLoaded = false;
 				}
-				case MENUACTION_NEWGAME:
-					DoSettingsBeforeStartingAGame();
-					break;
-				case MENUACTION_RELOADIDE:
-					CFileLoader::ReloadObjectTypes("GTA3.IDE");
-					break;
-				case MENUACTION_RESUME_FROM_SAVEZONE:
-					RequestFrontEndShutDown();
-					break;
-				case MENUACTION_KEYBOARDCTRLS:
-					SwitchToNewScreen(MENUPAGE_KEYBOARD_CONTROLS);
-					m_nSelectedListRow = 0;
-					m_nCurrExLayer = HOVEROPTION_LIST;
-					break;
-				case MENUACTION_GETKEY:
-					m_CurrCntrlAction = GetStartOptionsCntrlConfigScreens() + m_nCurrOption;
-					m_bKeyIsOK = true;
-					m_bWaitingForNewKeyBind = true;
-					m_bStartWaitingForKeyBind = true;
-					pControlEdit = &m_KeyPressedCode;
-					break;
-				case MENUACTION_CANCELGAME:
-					DMAudio.Service();
-					SwitchToNewScreen(MENUPAGE_OUTRO);
-					break;
-				case MENUACTION_RESUME:
-#ifdef LEGACY_MENU_OPTIONS
-					if (m_PrefsVsyncDisp != m_PrefsVsync) {
-						m_PrefsVsync = m_PrefsVsyncDisp;
-					}
-#endif
-					RequestFrontEndShutDown();
-					break;
-				case MENUACTION_DONTCANCEL:
-					SwitchToNewScreen(-2);
-					break;
-				case MENUACTION_SCREENRES:
-					if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
-						m_nPrefsVideoMode = m_nDisplayVideoMode;
-						_psSelectScreenVM(m_nPrefsVideoMode);
-						DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
-						DMAudio.Service();
-						CentreMousePointer();
-						m_bShowMouse = true;
-						// m_nCurrOption = 5; // Why? TODO(Miami)
-						m_nOptionHighlightTransitionBlend = 0;
-						SaveSettings();
-					}
-					break;
-#ifdef IMPROVED_VIDEOMODE
-				case MENUACTION_SCREENFORMAT:
-					if (m_nSelectedScreenMode != m_nPrefsWindowed) {
-						m_nPrefsWindowed = m_nSelectedScreenMode;
-						_psSelectScreenVM(m_nPrefsVideoMode); // apply same resolution
-						SaveSettings();
-					}
-					break;
+
 #endif
-				case MENUACTION_AUDIOHW:
-				{
-					int selectedProvider = m_nPrefsAudio3DProviderIndex;
-					if (selectedProvider != NO_AUDIO_PROVIDER) {
-						if (selectedProvider == -1)
-							selectedProvider = m_nPrefsAudio3DProviderIndex = DMAudio.AutoDetect3DProviders();
-						m_nPrefsAudio3DProviderIndex = DMAudio.SetCurrent3DProvider(m_nPrefsAudio3DProviderIndex);
-						if (selectedProvider != m_nPrefsAudio3DProviderIndex) {
-							SetHelperText(5);
+				SwitchToNewScreen(aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_TargetMenu);
+				break;
+			case MENUACTION_RADIO:
+				ChangeRadioStation(1);
+				break;
+			case MENUACTION_LANG_ENG:
+				m_PrefsLanguage = LANGUAGE_AMERICAN;
+				m_bFrontEnd_ReloadObrTxtGxt = true;
+				InitialiseChangedLanguageSettings();
+				SaveSettings();
+				break;
+			case MENUACTION_LANG_FRE:
+				m_PrefsLanguage = LANGUAGE_FRENCH;
+				m_bFrontEnd_ReloadObrTxtGxt = true;
+				InitialiseChangedLanguageSettings();
+				SaveSettings();
+				break;
+			case MENUACTION_LANG_GER:
+				m_PrefsLanguage = LANGUAGE_GERMAN;
+				m_bFrontEnd_ReloadObrTxtGxt = true;
+				InitialiseChangedLanguageSettings();
+				SaveSettings();
+				break;
+			case MENUACTION_LANG_ITA:
+				m_PrefsLanguage = LANGUAGE_ITALIAN;
+				m_bFrontEnd_ReloadObrTxtGxt = true;
+				InitialiseChangedLanguageSettings();
+				SaveSettings();
+				break;
+			case MENUACTION_LANG_SPA:
+				m_PrefsLanguage = LANGUAGE_SPANISH;
+				m_bFrontEnd_ReloadObrTxtGxt = true;
+				InitialiseChangedLanguageSettings();
+				SaveSettings();
+				break;
+			case MENUACTION_CHECKSAVE:
+			{
+				int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
+
+				if (saveSlot >= 2 && saveSlot <= 9) {
+					m_nCurrSaveSlot = saveSlot - 2;
+					if (Slots[m_nCurrSaveSlot] != SLOT_EMPTY && Slots[m_nCurrSaveSlot] != SLOT_CORRUPTED) {
+						if (m_nCurrScreen == MENUPAGE_CHOOSE_LOAD_SLOT) {
+							SwitchToNewScreen(MENUPAGE_LOAD_SLOT_CONFIRM);
+						} else if (m_nCurrScreen == MENUPAGE_CHOOSE_DELETE_SLOT) {
+							SwitchToNewScreen(MENUPAGE_DELETE_SLOT_CONFIRM);
 						}
-						SaveSettings();
 					}
-					break;
 				}
-				case MENUACTION_SPEAKERCONF:
-					if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
-						if (--m_PrefsSpeakers < 0)
-							m_PrefsSpeakers = 2;
-						DMAudio.SetSpeakerConfig(m_PrefsSpeakers);
-						SaveSettings();
-					}
-					break;
-				case MENUACTION_PLAYERSETUP:
-					CPlayerSkin::BeginFrontendSkinEdit();
-					SwitchToNewScreen(MENUPAGE_SKIN_SELECT);
-					m_nCurrExLayer = HOVEROPTION_LIST;
-					m_bSkinsEnumerated = false;
-					break;
-				case MENUACTION_RESTOREDEF:
-					if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS) {
-						m_nPrefsAudio3DProviderIndex = DMAudio.AutoDetect3DProviders();
-						DMAudio.SetCurrent3DProvider(m_nPrefsAudio3DProviderIndex);
-						m_PrefsSfxVolume = 49;
-						m_PrefsMusicVolume = 49;
-						m_PrefsRadioStation = EMOTION;
-						m_PrefsMP3BoostVolume = 0;
-						m_PrefsStereoMono = 1;
-						m_PrefsSpeakers = 0;
-						// DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume); // TODO(Miami)
-						DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
-						DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
-						DMAudio.SetRadioInCar(m_PrefsRadioStation);
-						DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
-						SaveSettings();
-					} else if (m_nCurrScreen == MENUPAGE_DISPLAY_SETTINGS) {
-						m_PrefsBrightness = 256;
-						m_PrefsLOD = 1.2f;
+				break;
+			}
+			case MENUACTION_NEWGAME:
+				DoSettingsBeforeStartingAGame();
+				break;
 #ifdef LEGACY_MENU_OPTIONS
-						m_PrefsVsync = true;
-#endif
-						CRenderer::ms_lodDistScale = m_PrefsLOD;
-						m_PrefsShowSubtitles = false;
-						m_PrefsUseWideScreen = false;
-						m_PrefsShowLegends = true;
-						m_PrefsVsyncDisp = true;
-						m_PrefsFrameLimiter = true;
-						m_PrefsRadarMode = 0;
-						m_PrefsShowHud = true;
-						m_nDisplayVideoMode = m_nPrefsVideoMode;
-						CMBlur::BlurOn = false;
-						SaveSettings();
-					} else if (m_nCurrScreen == MENUPAGE_CONTROLLER_PC) {
-						ControlsManager.MakeControllerActionsBlank();
-						ControlsManager.InitDefaultControlConfiguration();
-						ControlsManager.InitDefaultControlConfigMouse(MousePointerStateHelper.GetMouseSetUp());
-#if !defined RW_GL3
-						if (AllValidWinJoys.m_aJoys[JOYSTICK1].m_bInitialised) {
-							DIDEVCAPS devCaps;
-							devCaps.dwSize = sizeof(DIDEVCAPS);
-							PSGLOBAL(joy1)->GetCapabilities(&devCaps);
-							ControlsManager.InitDefaultControlConfigJoyPad(devCaps.dwButtons);
-						}
-#else
-						if (PSGLOBAL(joy1id) != -1 && glfwJoystickPresent(PSGLOBAL(joy1id))) {
-							int count;
-							glfwGetJoystickButtons(PSGLOBAL(joy1id), &count);
-							ControlsManager.InitDefaultControlConfigJoyPad(count);
-						}
+			case MENUACTION_RELOADIDE:
+				CFileLoader::ReloadObjectTypes("GTA3.IDE");
+				break;
 #endif
-						MousePointerStateHelper.bInvertVertically = true;
-						TheCamera.m_bHeadBob = false;
-						TheCamera.m_fMouseAccelHorzntl = 0.0025f;
-						CVehicle::m_bDisableMouseSteering = true;
-						m_ControlMethod = CONTROL_STANDARD;
-						TheCamera.m_bUseMouse3rdPerson = true;
-						SaveSettings();
-					}
-					SetHelperText(2);
-					break;
-				case MENUACTION_CTRLMETHOD:
-					if (m_ControlMethod == CONTROL_CLASSIC) {
-						CCamera::m_bUseMouse3rdPerson = true;
-						m_ControlMethod = CONTROL_STANDARD;
-					} else {
-						CCamera::m_bUseMouse3rdPerson = false;
-						m_ControlMethod = CONTROL_CLASSIC;
-					}
-					SaveSettings();
-					break;
-				case MENUACTION_LOADRADIO:
+			case MENUACTION_RESUME_FROM_SAVEZONE:
+				RequestFrontEndShutDown();
+				break;
+			case MENUACTION_LOADRADIO:
+				if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
 					SwitchToNewScreen(MENUPAGE_SOUND_SETTINGS);
 					DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
 					OutputDebugString("STARTED PLAYING FRONTEND AUDIO TRACK");
-					break;
-				case MENUACTION_SAVEGAME:
-				{
-					int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
+				}
+				break;
+			case MENUACTION_SAVEGAME:
+			{
+				int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
 
-					if (saveSlot >= 2 && saveSlot <= 9) {
-						m_nCurrSaveSlot = m_nCurrOption;
-						SwitchToNewScreen(MENUPAGE_SAVE_OVERWRITE_CONFIRM);
-					}
-					break;
+				if (saveSlot >= 2 && saveSlot <= 9) {
+					m_nCurrSaveSlot = m_nCurrOption;
+					SwitchToNewScreen(MENUPAGE_SAVE_OVERWRITE_CONFIRM);
 				}
+				break;
 			}
-		}
-		ProcessOnOffMenuOptions();
-	}
-
-	if (goBack) {
-		ResetHelperText();
-		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_BACK, 0);
-#ifdef PS2_LIKE_MENU
-		if (m_nCurrScreen == MENUPAGE_PAUSE_MENU || bottomBarActive) {
-#else
-		if (m_nCurrScreen == MENUPAGE_PAUSE_MENU) {
-#endif
-			if (!m_bGameNotLoaded) {
+			case MENUACTION_RADARMODE:
+				if (++m_PrefsRadarMode > 2)
+					m_PrefsRadarMode = 0;
+				SaveSettings();
+				break;
+			case MENUACTION_GOBACK:
+				goBack = true;
+				break;
+			case MENUACTION_KEYBOARDCTRLS:
+				SwitchToNewScreen(MENUPAGE_KEYBOARD_CONTROLS);
+				m_nSelectedListRow = 0;
+				m_nCurrExLayer = HOVEROPTION_LIST;
+				break;
+			case MENUACTION_GETKEY:
+				m_CurrCntrlAction = GetStartOptionsCntrlConfigScreens() + m_nCurrOption;
+				m_bKeyIsOK = true;
+				m_bWaitingForNewKeyBind = true;
+				m_bStartWaitingForKeyBind = true;
+				pControlEdit = &m_KeyPressedCode;
+				break;
+			case MENUACTION_CANCELGAME:
+				DMAudio.Service();
+				SwitchToNewScreen(MENUPAGE_OUTRO);
+				break;
+			case MENUACTION_RESUME:
 #ifdef LEGACY_MENU_OPTIONS
 				if (m_PrefsVsyncDisp != m_PrefsVsync) {
 					m_PrefsVsync = m_PrefsVsyncDisp;
 				}
 #endif
 				RequestFrontEndShutDown();
+				break;
+			case MENUACTION_DONTCANCEL:
+				SwitchToNewScreen(-2);
+				break;
+			case MENUACTION_SCREENRES:
+				if (m_nDisplayVideoMode != m_nPrefsVideoMode) {
+					m_nPrefsVideoMode = m_nDisplayVideoMode;
+					_psSelectScreenVM(m_nPrefsVideoMode);
+					DMAudio.ChangeMusicMode(MUSICMODE_FRONTEND);
+					DMAudio.Service();
+					CentreMousePointer();
+					m_bShowMouse = true;
+					m_nCurrOption = 5; // TODO(Miami): Because selected option is resetted after res. change. We'll need to revisit that.
+					m_nOptionHighlightTransitionBlend = 0;
+					SaveSettings();
+				}
+				break;
+#ifdef IMPROVED_VIDEOMODE
+			case MENUACTION_SCREENFORMAT:
+				if (m_nSelectedScreenMode != m_nPrefsWindowed) {
+					m_nPrefsWindowed = m_nSelectedScreenMode;
+					_psSelectScreenVM(m_nPrefsVideoMode); // apply same resolution
+					SaveSettings();
+				}
+				break;
+#endif
+			case MENUACTION_AUDIOHW:
+			{
+				int selectedProvider = m_nPrefsAudio3DProviderIndex;
+				if (selectedProvider != NO_AUDIO_PROVIDER) {
+					if (selectedProvider == -1)
+						selectedProvider = m_nPrefsAudio3DProviderIndex = DMAudio.AutoDetect3DProviders();
+					m_nPrefsAudio3DProviderIndex = DMAudio.SetCurrent3DProvider(m_nPrefsAudio3DProviderIndex);
+					if (selectedProvider != m_nPrefsAudio3DProviderIndex) {
+						SetHelperText(5);
+					}
+					SaveSettings();
+				}
+				break;
 			}
-
-			// We're already resuming, we don't need further processing.
-#if defined(FIX_BUGS) || defined(PS2_LIKE_MENU)
-			return;
+			case MENUACTION_SPEAKERCONF:
+				if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
+					if (--m_PrefsSpeakers < 0)
+						m_PrefsSpeakers = 2;
+					DMAudio.SetSpeakerConfig(m_PrefsSpeakers);
+					SaveSettings();
+				}
+				break;
+			case MENUACTION_PLAYERSETUP:
+				CPlayerSkin::BeginFrontendSkinEdit();
+				SwitchToNewScreen(MENUPAGE_SKIN_SELECT);
+				m_bSkinsEnumerated = false;
+				m_nCurrExLayer = HOVEROPTION_LIST;
+				break;
+			case MENUACTION_RESTOREDEF:
+				if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS) {
+					m_nPrefsAudio3DProviderIndex = DMAudio.AutoDetect3DProviders();
+					DMAudio.SetCurrent3DProvider(m_nPrefsAudio3DProviderIndex);
+					m_PrefsSfxVolume = 49;
+					m_PrefsMusicVolume = 49;
+					m_PrefsRadioStation = EMOTION;
+					m_PrefsMP3BoostVolume = 0;
+					m_PrefsStereoMono = 1;
+					m_PrefsSpeakers = 0;
+					// DMAudio.SetMP3BoostVolume(m_PrefsMP3BoostVolume); // TODO(Miami)
+					DMAudio.SetMusicMasterVolume(m_PrefsMusicVolume);
+					DMAudio.SetEffectsMasterVolume(m_PrefsSfxVolume);
+					DMAudio.SetRadioInCar(m_PrefsRadioStation);
+					DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
+					SaveSettings();
+				} else if (m_nCurrScreen == MENUPAGE_DISPLAY_SETTINGS) {
+					m_PrefsBrightness = 256;
+					m_PrefsLOD = 1.2f;
+#ifdef LEGACY_MENU_OPTIONS
+					m_PrefsVsync = true;
 #endif
-		}
-#ifdef PS2_LIKE_MENU
-		else if (m_nCurrScreen == MENUPAGE_CHOOSE_SAVE_SLOT || m_nCurrScreen == MENUPAGE_SAVE) {
+					CRenderer::ms_lodDistScale = m_PrefsLOD;
+					m_PrefsShowSubtitles = false;
+					m_PrefsUseWideScreen = false;
+					m_PrefsShowLegends = true;
+					m_PrefsVsyncDisp = true;
+					m_PrefsFrameLimiter = true;
+					m_PrefsRadarMode = 0;
+					m_PrefsShowHud = true;
+					m_nDisplayVideoMode = m_nPrefsVideoMode;
+					CMBlur::BlurOn = false;
+					SaveSettings();
+				} else if (m_nCurrScreen == MENUPAGE_CONTROLLER_PC) {
+					ControlsManager.MakeControllerActionsBlank();
+					ControlsManager.InitDefaultControlConfiguration();
+					ControlsManager.InitDefaultControlConfigMouse(MousePointerStateHelper.GetMouseSetUp());
+#if !defined RW_GL3
+					if (AllValidWinJoys.m_aJoys[JOYSTICK1].m_bInitialised) {
+						DIDEVCAPS devCaps;
+						devCaps.dwSize = sizeof(DIDEVCAPS);
+						PSGLOBAL(joy1)->GetCapabilities(&devCaps);
+						ControlsManager.InitDefaultControlConfigJoyPad(devCaps.dwButtons);
+					}
 #else
-		else if (m_nCurrScreen == MENUPAGE_CHOOSE_SAVE_SLOT) {
+					if (PSGLOBAL(joy1id) != -1 && glfwJoystickPresent(PSGLOBAL(joy1id))) {
+						int count;
+						glfwGetJoystickButtons(PSGLOBAL(joy1id), &count);
+						ControlsManager.InitDefaultControlConfigJoyPad(count);
+					}
 #endif
-			RequestFrontEndShutDown();
-		}
-		// It's now in ThingsToDoBeforeLeavingPage()
-#ifndef TIDY_UP_PBP
-		else if (m_nCurrScreen == MENUPAGE_SOUND_SETTINGS) {
-			DMAudio.StopFrontEndTrack();
-			OutputDebugString("FRONTEND AUDIO TRACK STOPPED");
+					MousePointerStateHelper.bInvertVertically = true;
+					TheCamera.m_bHeadBob = false;
+					TheCamera.m_fMouseAccelHorzntl = 0.0025f;
+					CVehicle::m_bDisableMouseSteering = true;
+					m_ControlMethod = CONTROL_STANDARD;
+					TheCamera.m_bUseMouse3rdPerson = true;
+					SaveSettings();
+				}
+				SetHelperText(2);
+				break;
+			case MENUACTION_CTRLMETHOD:
+				if (m_ControlMethod == CONTROL_CLASSIC) {
+					CCamera::m_bUseMouse3rdPerson = true;
+					m_ControlMethod = CONTROL_STANDARD;
+				} else {
+					CCamera::m_bUseMouse3rdPerson = false;
+					m_ControlMethod = CONTROL_CLASSIC;
+				}
+				SaveSettings();
+				break;
 		}
-#endif
+		ProcessOnOffMenuOptions();
+		if (!goBack) {
+			int saveSlot = aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_SaveSlot;
 
-		int oldScreen = aScreens[m_nCurrScreen].m_PreviousPage;
+			if (saveSlot >= 2 && saveSlot <= 9 && Slots[m_nCurrOption] != SLOT_OK)
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_BACK, 0);
+			else
+				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
+		}
+	}
 
-		if (oldScreen != -1) {
-			ThingsToDoBeforeLeavingPage();
+	if (goBack) {
+		if (m_NoEmptyBinding) {
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
+			SwitchToNewScreen(-2);
 			if ((m_nCurrScreen == MENUPAGE_SKIN_SELECT) || (m_nCurrScreen == MENUPAGE_KEYBOARD_CONTROLS)) {
 				m_nTotalListRow = 0;
 			}
-
-#ifdef PS2_LIKE_MENU
-			if (!bottomBarActive &&
-				(oldScreen == MENUPAGE_NONE || oldScreen == MENUPAGE_OPTIONS)) {
-				bottomBarActive = true;
-			} else
-#endif
-			{
-				SwitchToNewScreen(-2);
-			}
-
-			// We will go back for sure at this point, why process other things?!
-#ifdef FIX_BUGS
-			return;
-#endif
+		} else {
+			DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_BACK, 0);
+			m_ShowEmptyBindingError = true;
 		}
 	}
 
-#ifdef PS2_LIKE_MENU
-	if (bottomBarActive)
-		return;
-#endif
-
-
 	if (changeAmount != 0) {
 		switch (aScreens[m_nCurrScreen].m_aEntries[m_nCurrOption].m_Action) {
 			case MENUACTION_RADIO:
-				m_PrefsRadioStation += changeAmount;
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
-				if (DMAudio.IsMP3RadioChannelAvailable()) {
-					if (m_PrefsRadioStation < WILDSTYLE)
-						m_PrefsRadioStation = USERTRACK;
-					if (m_PrefsRadioStation > USERTRACK)
-						m_PrefsRadioStation = WILDSTYLE;
-				} else {
-					if (m_PrefsRadioStation < WILDSTYLE)
-						m_PrefsRadioStation = WAVE;
-					if (m_PrefsRadioStation > WAVE)
-						m_PrefsRadioStation = WILDSTYLE;
-				}
-				SaveSettings();
-				DMAudio.SetRadioInCar(m_PrefsRadioStation);
-				DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
-				OutputDebugString("FRONTEND RADIO STATION CHANGED");
+				ChangeRadioStation(changeAmount);
+				break;
+			case MENUACTION_RADARMODE:
+				m_PrefsRadarMode += changeAmount;
+				if (m_PrefsRadarMode < 0)
+					m_PrefsRadarMode = 2;
+				if (m_PrefsRadarMode > 2)
+					m_PrefsRadarMode = 0;
 				break;
 #ifdef ASPECT_RATIO_SCALE
 			case MENUACTION_WIDESCREEN:
@@ -4612,11 +4173,12 @@ CMenuManager::ProcessButtonPresses(uint8 goDown, uint8 goUp, uint8 optionSelecte
 				break;
 #endif
 			case MENUACTION_AUDIOHW:
+				// TODO(Miami): What are the extra things in here??
+
 				if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
 					m_nPrefsAudio3DProviderIndex += changeAmount;
 					m_nPrefsAudio3DProviderIndex = clamp(m_nPrefsAudio3DProviderIndex, 0, DMAudio.GetNum3DProvidersAvailable() - 1);
 				}
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_NEW_PAGE, 0);
 				break;
 			case MENUACTION_SPEAKERCONF:
 				if (m_nPrefsAudio3DProviderIndex != NO_AUDIO_PROVIDER) {
@@ -4624,13 +4186,11 @@ CMenuManager::ProcessButtonPresses(uint8 goDown, uint8 goUp, uint8 optionSelecte
 					m_PrefsSpeakers = clamp(m_PrefsSpeakers, 0, 2);
 					DMAudio.SetSpeakerConfig(m_PrefsSpeakers);
 					SaveSettings();
-					DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 				}
 				break;
 			case MENUACTION_CTRLMETHOD:
 				m_ControlMethod = !m_ControlMethod;
 				CCamera::m_bUseMouse3rdPerson = !m_ControlMethod;
-				DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SETTING_CHANGE, 0);
 				SaveSettings();
 				break;
 		}
@@ -4885,10 +4445,6 @@ CMenuManager::SwitchMenuOnAndOff()
 					_InputInitialiseMouse(true);
 				}
 
-#ifdef PS2_LIKE_MENU
-				bottomBarActive = false;
-#endif
-
 				m_StatsScrollSpeed = 150.0f;
 				SaveSettings();
 				pControlEdit = nil;
@@ -5386,6 +4942,47 @@ CMenuManager::ConstructStatLine(int rowIdx)
 #undef STAT_LINE
 }
 
+// TODO(Miami): These #if 0's are here because we still use III radio selector. Remove them when new one reversed
+void
+CMenuManager::ChangeRadioStation(uint8 increaseBy)
+{
+	if (m_ScrollRadioBy != 0)
+		return;
+
+	m_PrefsRadioStation += increaseBy;
+#if 0
+	m_ScrollRadioBy = increaseBy;
+	if (m_ScrollRadioBy == 1) {
+		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
+		field_F0 = 238.0f;
+	} else {
+		DMAudio.PlayFrontEndSound(SOUND_FRONTEND_FAIL, 0);
+		field_F0 = 118.0f;
+	}
+#endif
+
+	if (DMAudio.IsMP3RadioChannelAvailable()) {
+		if (m_PrefsRadioStation < WILDSTYLE)
+			m_PrefsRadioStation = USERTRACK;
+		if (m_PrefsRadioStation > USERTRACK)
+			m_PrefsRadioStation = WILDSTYLE;
+	} else {
+		if (m_PrefsRadioStation < WILDSTYLE)
+			m_PrefsRadioStation = WAVE;
+		if (m_PrefsRadioStation > WAVE)
+			m_PrefsRadioStation = WILDSTYLE;
+	}
+#if 0
+	DMAudio.StopFrontEndTrack();
+	DMAudio.PlayFrontEndSound(SOUND_194, 0);
+#else
+	SaveSettings();
+	DMAudio.SetRadioInCar(m_PrefsRadioStation);
+	DMAudio.PlayFrontEndTrack(m_PrefsRadioStation, 1);
+	OutputDebugString("FRONTEND RADIO STATION CHANGED");
+#endif
+}
+
 #if 0
 uint8 CMenuManager::GetNumberOfMenuOptions()
 {
diff --git a/src/core/Frontend.h b/src/core/Frontend.h
index 456e9bd0..6cd58e7d 100644
--- a/src/core/Frontend.h
+++ b/src/core/Frontend.h
@@ -5,15 +5,9 @@
 
 #include "Sprite2d.h"
 
-#ifdef PS2_LIKE_MENU
-#define MENUHEADER_POS_X 50.0f
-#define MENUHEADER_POS_Y 75.0f
-#define MENUHEADER_HEIGHT 1.3f
-#else
 #define MENUHEADER_POS_X 10.0f
 #define MENUHEADER_POS_Y 10.0f
 #define MENUHEADER_HEIGHT 2.0f
-#endif
 #define MENUHEADER_WIDTH 1.0f
 
 #define MENU_UNK_X_MARGIN 10.0f
@@ -237,9 +231,6 @@ enum eMenuAction
 	MENUACTION_SETDBGFLAG,
 	MENUACTION_LOADRADIO,
 	MENUACTION_SAVEGAME,
-
-	// Below this is TODO(Miami)
-	MENUACTION_DRAWDIST,
 	MENUACTION_SWITCHBIGWHITEDEBUGLIGHT,
 	MENUACTION_COLLISIONPOLYS,
 	MENUACTION_LEGENDS,
@@ -247,16 +238,11 @@ enum eMenuAction
 	MENUACTION_HUD,
 	MENUACTION_GOBACK,
 	MENUACTION_KEYBOARDCTRLS,
-	MENUACTION_PARSEHEAP,
-	// MENUACTION_MEMCARDSAVECONFIRM is that on VC enum??
-	MENUACTION_DEBUGSTREAM,
 	MENUACTION_GETKEY,
 	MENUACTION_SHOWHEADBOB,
-	MENUACTION_UNK80,
+	MENUACTION_UNK38, // MENUACTION_PARSEHEAP? MENUACTION_DEBUGSTREAM? MENUACTION_MEMCARDSAVECONFIRM?
 	MENUACTION_INVVERT,
 	MENUACTION_CANCELGAME,
-	MENUACTION_MOUSESENS,
-	MENUACTION_MP3VOLUMEBOOST,
 	MENUACTION_RESUME,
 	MENUACTION_DONTCANCEL,
 	MENUACTION_SCREENRES,
@@ -267,7 +253,9 @@ enum eMenuAction
 	MENUACTION_CTRLMETHOD,
 	MENUACTION_DYNAMICACOUSTIC,
 	MENUACTION_MOUSESTEER,
-	MENUACTION_UNK110,
+	MENUACTION_DRAWDIST,
+	MENUACTION_MOUSESENS,
+	MENUACTION_MP3VOLUMEBOOST,
 #ifdef IMPROVED_VIDEOMODE
 	MENUACTION_SCREENFORMAT,
 #endif
@@ -532,7 +520,7 @@ public:
 	CSprite2d m_aFrontEndSprites[NUM_MENU_SPRITES];
 	bool m_bSpritesLoaded;
 	int32 field_F0;
-	int32 m_LastRadioScrollDir;
+	int32 m_ScrollRadioBy;
 	int32 m_nCurrScreen;
 	int32 m_nPrevScreen;
 	int32 m_nCurrSaveSlot;
@@ -678,7 +666,8 @@ public:
 	void Process();
 	void ProcessList(bool &optionSelected, bool &goBack);
 	void UserInput();
-	void ProcessButtonPresses(uint8, uint8, uint8, uint8, int8);
+	void ProcessUserInput(uint8, uint8, uint8, uint8, int8);
+	void ChangeRadioStation(uint8);
 	void ProcessFileActions();
 	void ProcessOnOffMenuOptions();
 	void RequestFrontEndShutDown();
diff --git a/src/core/Frontend_PS2.cpp b/src/core/Frontend_PS2.cpp
index d9eff445..c9264f7d 100644
--- a/src/core/Frontend_PS2.cpp
+++ b/src/core/Frontend_PS2.cpp
@@ -203,6 +203,9 @@ static const char* FrontendFilenames[][2] =
 	{"fe_radio9",         "" },
 };
 
+#ifdef CUTSCENE_BORDERS_SWITCH
+bool CMenuManager::m_PrefsCutsceneBorders = true;
+#endif
 
 int32 CMenuManager::m_PrefsSfxVolume = 102;
 int32 CMenuManager::m_PrefsMusicVolume = 102;
diff --git a/src/core/Frontend_PS2.h b/src/core/Frontend_PS2.h
index 2f226dc3..6311d821 100644
--- a/src/core/Frontend_PS2.h
+++ b/src/core/Frontend_PS2.h
@@ -161,6 +161,9 @@ public:
 	static CONTRCONFIG m_PrefsControllerConfig;
 	static bool m_PrefsUseVibration;
 
+#ifdef CUTSCENE_BORDERS_SWITCH
+	static bool m_PrefsCutsceneBorders;
+#endif
 
 #ifdef GTA_PC
 	bool m_bQuitGameNoCD;
diff --git a/src/core/IniFile.cpp b/src/core/IniFile.cpp
index df01b440..f7e2bfdd 100644
--- a/src/core/IniFile.cpp
+++ b/src/core/IniFile.cpp
@@ -7,8 +7,10 @@
 #include "main.h"
 #include "Population.h"
 
-float CIniFile::PedNumberMultiplier = 1.0f;
-float CIniFile::CarNumberMultiplier = 1.0f;
+// --MIAMI: file done
+
+float CIniFile::PedNumberMultiplier = 0.6f;
+float CIniFile::CarNumberMultiplier = 0.6f;
 
 void CIniFile::LoadIniFile()
 {
@@ -24,5 +26,6 @@ void CIniFile::LoadIniFile()
 		CFileMgr::CloseFile(f);
 	}
 	CPopulation::MaxNumberOfPedsInUse = 25.0f * PedNumberMultiplier;
+	CPopulation::MaxNumberOfPedsInUseInterior = 40.0f * PedNumberMultiplier;
 	CCarCtrl::MaxNumberOfCarsInUse = 12.0f * CarNumberMultiplier;
 }
\ No newline at end of file
diff --git a/src/core/MenuScreens.cpp b/src/core/MenuScreens.cpp
index 65c265ed..11cd3078 100644
--- a/src/core/MenuScreens.cpp
+++ b/src/core/MenuScreens.cpp
@@ -331,8 +331,6 @@ CMenuScreen aScreens[] = {
 		MENUACTION_SETDBGFLAG,	"FED_DFL", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
 		MENUACTION_SWITCHBIGWHITEDEBUGLIGHT,	"FED_DLS", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
 		MENUACTION_COLLISIONPOLYS,	"FED_SCP", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
-		MENUACTION_PARSEHEAP,	"FED_PAH", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
-		MENUACTION_DEBUGSTREAM,	"FED_DSR", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
 		MENUACTION_GOBACK,		"FEDS_TB", SAVESLOT_NONE, MENUPAGE_NONE, 0, 0, 0,
 	},
 	
diff --git a/src/core/common.h b/src/core/common.h
index 0a2a236e..16d32b32 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -144,8 +144,11 @@ inline uint32 ldb(uint32 p, uint32 s, uint32 w)
 
 #ifdef ASPECT_RATIO_SCALE
 #define SCREEN_SCALE_AR(a) ((a) * DEFAULT_ASPECT_RATIO / SCREEN_ASPECT_RATIO)
+extern float ScaleAndCenterX(float x);
+#define SCALE_AND_CENTER_X(x) ScaleAndCenterX(x)
 #else
 #define SCREEN_SCALE_AR(a) (a)
+#define SCALE_AND_CENTER_X(x) SCREEN_STRETCH_X(x)
 #endif
 
 #include "maths.h"
diff --git a/src/core/timebars.cpp b/src/core/timebars.cpp
index 884feffd..68570021 100644
--- a/src/core/timebars.cpp
+++ b/src/core/timebars.cpp
@@ -89,7 +89,7 @@ void tbDisplay()
 	CFont::SetScale(0.48f, 1.12f);
 	CFont::SetCentreOff();
 	CFont::SetJustifyOff();
-	CFont::SetWrapx(640.0f);
+	CFont::SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
 	CFont::SetRightJustifyOff();
 	CFont::SetPropOn();
 	CFont::SetFontStyle(FONT_STANDARD);
diff --git a/src/modelinfo/ModelInfo.cpp b/src/modelinfo/ModelInfo.cpp
index 3dc048c9..961efa84 100644
--- a/src/modelinfo/ModelInfo.cpp
+++ b/src/modelinfo/ModelInfo.cpp
@@ -5,6 +5,8 @@
 #include "ModelIndices.h"
 #include "ModelInfo.h"
 
+// --MIAMI: file done
+
 CBaseModelInfo *CModelInfo::ms_modelInfoPtrs[MODELINFOSIZE];
 
 CStore<CSimpleModelInfo, SIMPLEMODELSIZE> CModelInfo::ms_simpleModelStore;
@@ -21,6 +23,14 @@ CModelInfo::Initialise(void)
 	int i;
 	CSimpleModelInfo *m;
 
+	debug("sizeof SimpleModelStore %d\n", sizeof(ms_simpleModelStore));
+	debug("sizeof TimeModelStore %d\n", sizeof(ms_timeModelStore));
+	debug("sizeof WeaponModelStore %d\n", sizeof(ms_weaponModelStore));
+	debug("sizeof ClumpModelStore %d\n", sizeof(ms_clumpModelStore));
+	debug("sizeof VehicleModelStore %d\n", sizeof(ms_vehicleModelStore));
+	debug("sizeof PedModelStore %d\n", sizeof(ms_pedModelStore));
+	debug("sizeof 2deffectsModelStore %d\n", sizeof(ms_2dEffectStore));
+
 	for(i = 0; i < MODELINFOSIZE; i++)
 		ms_modelInfoPtrs[i] = nil;
 	ms_2dEffectStore.clear();
@@ -191,6 +201,9 @@ CModelInfo::GetModelInfo(const char *name, int *id)
 CBaseModelInfo*
 CModelInfo::GetModelInfo(const char *name, int minIndex, int maxIndex)
 {
+	if (minIndex > maxIndex)
+		return 0;
+
 	CBaseModelInfo *modelinfo;
 	for(int i = minIndex; i <= maxIndex; i++){
 		modelinfo = CModelInfo::ms_modelInfoPtrs[i];
@@ -221,6 +234,20 @@ CModelInfo::IsCarModel(int32 id)
 		((CVehicleModelInfo*)GetModelInfo(id))->m_vehicleType == VEHICLE_TYPE_CAR;
 }
 
+bool
+CModelInfo::IsHeliModel(int32 id)
+{
+	return GetModelInfo(id)->GetModelType() == MITYPE_VEHICLE &&
+		((CVehicleModelInfo*)GetModelInfo(id))->m_vehicleType == VEHICLE_TYPE_HELI;
+}
+
+bool
+CModelInfo::IsPlaneModel(int32 id)
+{
+	return GetModelInfo(id)->GetModelType() == MITYPE_VEHICLE &&
+		((CVehicleModelInfo*)GetModelInfo(id))->m_vehicleType == VEHICLE_TYPE_PLANE;
+}
+
 void
 CModelInfo::ReInit2dEffects()
 {
diff --git a/src/modelinfo/ModelInfo.h b/src/modelinfo/ModelInfo.h
index a24ba797..1ac7b0bb 100644
--- a/src/modelinfo/ModelInfo.h
+++ b/src/modelinfo/ModelInfo.h
@@ -43,5 +43,7 @@ public:
 	static bool IsBoatModel(int32 id);
 	static bool IsBikeModel(int32 id);
 	static bool IsCarModel(int32 id);
+	static bool IsHeliModel(int32 id);
+	static bool IsPlaneModel(int32 id);
 	static void ReInit2dEffects();
 };
diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index 2be45ba9..1950c4b3 100644
--- a/src/peds/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
@@ -117,7 +117,7 @@ CCivilianPed::CivilianAI(void)
 				} else {
 					SetMoveState(PEDMOVE_WALK);
 				}
-			} else if (threatPed->IsPlayer() && IsGangMember() && b158_80) {
+			} else if (threatPed->IsPlayer() && IsGangMember() && bCanAttackPlayerWithCops) {
 				SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, m_threatEntity);
 
 			} else if (threatPed->IsPlayer() && FindPlayerPed()->m_pWanted->m_CurrentCops != 0)  {
@@ -203,7 +203,7 @@ CCivilianPed::CivilianAI(void)
 			CPed *threatPed = (CPed*)m_threatEntity;
 			if (m_pedStats->m_fear <= 100 - threatPed->m_pedStats->m_temper && threatPed->m_nPedType != PEDTYPE_COP) {
 				if (threatPed->GetWeapon()->IsTypeMelee() || !GetWeapon()->IsTypeMelee()) {
-					if (threatPed->IsPlayer() && IsGangMember() && b158_80) {
+					if (threatPed->IsPlayer() && IsGangMember() && bCanAttackPlayerWithCops) {
 						SetObjective(OBJECTIVE_KILL_CHAR_ON_FOOT, m_threatEntity);
 
 					} else if (threatPed->IsPlayer() && FindPlayerPed()->m_pWanted->m_CurrentCops != 0) {
diff --git a/src/peds/Gangs.cpp b/src/peds/Gangs.cpp
index 2d6d1137..38e37430 100644
--- a/src/peds/Gangs.cpp
+++ b/src/peds/Gangs.cpp
@@ -6,6 +6,8 @@
 #include "Streaming.h"
 #include "Weapon.h"
 
+// --MIAMI: file done
+
 CGangInfo CGangs::Gang[NUM_GANGS];
 bool CGangs::GangAttackWithCops[NUM_GANGS];
 
diff --git a/src/peds/Ped.cpp b/src/peds/Ped.cpp
index a7c82f0a..f6d54268 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -459,7 +459,7 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	bCollectBusFare = false;
 	bBoughtIceCream = false;
 	bDonePositionOutOfCollision = false;
-	b158_80 = false;
+	bCanAttackPlayerWithCops = false;
 
 	if (CGeneral::GetRandomNumber() & 3)
 		bHasACamera = false;
diff --git a/src/peds/Ped.h b/src/peds/Ped.h
index 03dcebff..3ee38df3 100644
--- a/src/peds/Ped.h
+++ b/src/peds/Ped.h
@@ -491,7 +491,7 @@ public:
 	uint32 bCollectBusFare : 1;
 	uint32 bBoughtIceCream : 1;
 	uint32 bDonePositionOutOfCollision : 1;
-	uint32 b158_80 : 1;
+	uint32 bCanAttackPlayerWithCops : 1;
 
 	// our own flags
 	uint32 m_ped_flagI80 : 1; // KANGAROO_CHEAT define makes use of this as cheat toggle 
diff --git a/src/peds/PedChat.cpp b/src/peds/PedChat.cpp
index 73a8e59c..b7732274 100644
--- a/src/peds/PedChat.cpp
+++ b/src/peds/PedChat.cpp
@@ -4,7 +4,8 @@
 #include "General.h"
 #include "Ped.h"
 
-// --MIAMI: Done
+// --MIAMI: file done
+
 // Corresponds to ped sounds (from SOUND_PED_DEATH to SOUND_PED_TAXI_CALL)
 PedAudioData CommentWaitTime[56] = {
   { 500, 800, 500, 2 },
@@ -65,14 +66,12 @@ PedAudioData CommentWaitTime[56] = {
   { 0, 0, 0, 0 }
 };
 
-// --MIAMI: Done
 bool
 CPed::ServiceTalkingWhenDead(void)
 {
 	return m_queuedSound == SOUND_PED_DEATH;
 }
 
-// --MIAMI: Done
 void
 CPed::ServiceTalking(void)
 {
@@ -102,7 +101,6 @@ CPed::ServiceTalking(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::Say(uint16 audio)
 {
@@ -157,7 +155,6 @@ CPed::Say(uint16 audio)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::Say(uint16 audio, int32 time)
 {
diff --git a/src/peds/PedType.cpp b/src/peds/PedType.cpp
index 397cd71d..8a631e7a 100644
--- a/src/peds/PedType.cpp
+++ b/src/peds/PedType.cpp
@@ -3,6 +3,8 @@
 #include "FileMgr.h"
 #include "PedType.h"
 
+// --MIAMI: file done
+
 CPedType *CPedType::ms_apPedType[NUM_PEDTYPES];
 
 void
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index 35a09a4f..94533f4a 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -23,6 +23,13 @@
 #include "Script.h"
 #include "Shadows.h"
 #include "SurfaceTable.h"
+#include "Weather.h"
+#include "Darkel.h"
+#include "Streaming.h"
+#include "Clock.h"
+#include "WaterLevel.h"
+
+// --MIAMI: File done
 
 #define MIN_CREATION_DIST		40.0f // not for start of the game (look at the GeneratePedsAtStartOfGame)
 #define CREATION_RANGE			10.0f // added over the MIN_CREATION_DIST.
@@ -30,37 +37,13 @@
 #define PED_REMOVE_DIST			(MIN_CREATION_DIST + CREATION_RANGE + 1.0f)
 #define PED_REMOVE_DIST_SPECIAL	(MIN_CREATION_DIST + CREATION_RANGE + 15.0f) // for peds with bCullExtraFarAway flag
 
-// Transition areas between zones
-const RegenerationPoint aSafeZones[] = {
-// TODO(MIAMI): this is totally bogus
-	{ LEVEL_BEACH, LEVEL_MAINLAND, 400.0f, 814.0f, -954.0f, -903.0f, 30.0f, 100.0f,
-		CVector(790.0f, -917.0f, 39.0f), CVector(775.0f, -921.0f, 39.0f), CVector(424.0f, -942.0f, 38.0f), CVector(439.0f, -938.0f, 38.0f) },
-#ifndef MIAMI
-	{ LEVEL_INDUSTRIAL, LEVEL_COMMERCIAL, 400.0f, 814.0f, -954.0f, -903.0f, 30.0f, 100.0f,
-		CVector(790.0f, -917.0f, 39.0f), CVector(775.0f, -921.0f, 39.0f), CVector(424.0f, -942.0f, 38.0f), CVector(439.0f, -938.0f, 38.0f) },
-	{ LEVEL_INDUSTRIAL, LEVEL_COMMERCIAL, 555.0f, 711.0f, 118.0f, 186.0f, -30.0f, -10.0f,
-		CVector(698.0f,  182.0f, -20.0f), CVector(681.0f,  178.0f, -20.0f), CVector(586.0f,  144.0f, -20.0f), CVector(577.0f,  135.0f, -20.0f) },
-	{ LEVEL_INDUSTRIAL, LEVEL_COMMERCIAL, 626.0f, 744.0f, -124.0f, -87.0f, -20.0f, -6.0f,
-		CVector(736.0f, -117.0f, -13.0f), CVector(730.0f, -115.0f, -13.0f), CVector(635.0f, -93.0f, -12.5f), CVector(650.0f, -89.0f, -12.5f) },
-	{ LEVEL_INDUSTRIAL, LEVEL_COMMERCIAL, 645.0f, 734.0f, -780.0f, -750.0f, -25.0f, -6.0f,
-		CVector(729.0f, -764.0f, -18.0f), CVector(720.0f, -769.0f, -17.0f), CVector(652.0f, -774.0f, -10.5f), CVector(659.0f, -770.0f, -10.5f) },
-	{ LEVEL_COMMERCIAL, LEVEL_SUBURBAN, -532.0f, -136.0f, -668.0f, -599.0f, 34.0f, 60.0f,
-		CVector(-172.0f, -619.0f,  44.0f), CVector(-183.0f, -623.0f,  44.0f), CVector(-511.0f, -645.0f,  41.0f), CVector(-493.0f, -639.0f,  41.5f) },
-	{ LEVEL_COMMERCIAL, LEVEL_SUBURBAN, -325.0f, -175.0f, 27.0f, 75.0f, -30.0f, -10.0f,
-		CVector(-185.0f,  40.8f, -20.5f), CVector(-202.0f,  37.0f, -20.5f), CVector(-315.0f,  65.5f, -20.5f), CVector(-306.0f,  62.4f, -20.5f) },
-	{ LEVEL_COMMERCIAL, LEVEL_SUBURBAN, -410.0f, -310.0f, -1055.0f, -1030.0f, -20.0f, -6.0f,
-		CVector(-321.0f, -1043.0f, -13.2f), CVector(-328.0f, -1045.0f, -13.2f), CVector(-398.0f, -1044.0f, -13.5f), CVector(-390.0f, -1040.5f, -13.5f) },
-	{ LEVEL_COMMERCIAL, LEVEL_SUBURBAN, -425.0f, -280.0f, -471.0f, -447.0f, -20.0f, -5.0f,
-		CVector(-292.0f, -457.0f, -11.6f), CVector(-310.0f, -461.0f, -11.6f), CVector(-413.0f, -461.0f, -11.5f), CVector(-399.0f, -457.0f, -11.3f) }
-#endif
-};
-
 PedGroup CPopulation::ms_pPedGroups[NUMPEDGROUPS];
 bool CPopulation::ms_bGivePedsWeapons;
 int32 CPopulation::m_AllRandomPedsThisType = -1;
 float CPopulation::PedDensityMultiplier = 1.0f;
 uint32 CPopulation::ms_nTotalMissionPeds;
 int32 CPopulation::MaxNumberOfPedsInUse = 25;
+int32 CPopulation::MaxNumberOfPedsInUseInterior = 40;
 uint32 CPopulation::ms_nNumCivMale;
 uint32 CPopulation::ms_nNumCivFemale;
 uint32 CPopulation::ms_nNumCop;
@@ -80,13 +63,14 @@ uint32 CPopulation::ms_nNumGang6;
 uint32 CPopulation::ms_nNumGang9;
 uint32 CPopulation::ms_nNumGang7;
 uint32 CPopulation::ms_nNumGang8;
-CVector CPopulation::RegenerationPoint_a;
-CVector CPopulation::RegenerationPoint_b;
-CVector CPopulation::RegenerationForward;
 
 uint32 CPopulation::ms_nTotalCarPassengerPeds;
 uint32 CPopulation::NumMiamiViceCops;
 
+uint32 gLastSelectedCivilianIndex;
+CEntity *gSunbatheObstacles[2];
+CEntity *gCoupleObstacles[3];
+
 void
 CPopulation::Initialise()
 {
@@ -108,16 +92,16 @@ CPopulation::Initialise()
 	ms_nNumDummy = 0;
 
 	ms_nTotalCarPassengerPeds = 0;
+	ms_nTotalCivPeds = 0;
+	ms_nTotalGangPeds = 0;
+	ms_nTotalPeds = 0;
+	ms_nTotalMissionPeds = 0;
+	m_CountDownToPedsAtStart = 2;
+	bZoneChangeHasHappened = false; // III leftover
 
 	m_AllRandomPedsThisType = -1;
 	PedDensityMultiplier = 1.0f;
-	bZoneChangeHasHappened = false;
-	m_CountDownToPedsAtStart = 2;
 	
-	ms_nTotalMissionPeds = 0;
-	ms_nTotalPeds = 0;
-	ms_nTotalGangPeds = 0;
-	ms_nTotalCivPeds = 0;
 
 	LoadPedGroups();
 
@@ -134,7 +118,45 @@ CPopulation::RemovePed(CPed *ent)
 int32
 CPopulation::ChooseCivilianOccupation(int32 group)
 {
-	return ms_pPedGroups[group].models[CGeneral::GetRandomNumberInRange(0, NUMMODELSPERPEDGROUP)];
+	if (CWeather::Rain > 0.1f) {
+		int32 lastModel;
+		for (int i = 0; i < 8; i++) {
+			gLastSelectedCivilianIndex = CGeneral::GetRandomNumberInRange(0, NUMMODELSPERPEDGROUP);
+			lastModel = ms_pPedGroups[group].models[gLastSelectedCivilianIndex];
+
+			if (!CPopulation::IsSunbather(lastModel))
+				break;
+		}
+		return lastModel;
+
+	} else {
+		gLastSelectedCivilianIndex = CGeneral::GetRandomNumberInRange(0, NUMMODELSPERPEDGROUP);
+		return ms_pPedGroups[group].models[gLastSelectedCivilianIndex];
+	}
+}
+
+int32
+CPopulation::ChooseNextCivilianOccupation(int32 group)
+{
+	if (CWeather::Rain > 0.1f) {
+		int32 lastModel;
+		for (int i = 0; i < NUMMODELSPERPEDGROUP; i++) {
+			++gLastSelectedCivilianIndex;
+			if (gLastSelectedCivilianIndex >= NUMMODELSPERPEDGROUP)
+				gLastSelectedCivilianIndex = 0;
+			lastModel = ms_pPedGroups[group].models[gLastSelectedCivilianIndex];
+
+			if (!CPopulation::IsSunbather(ms_pPedGroups[group].models[gLastSelectedCivilianIndex]))
+				break;
+		}
+		return lastModel;
+
+	} else {
+		++gLastSelectedCivilianIndex;
+		if (gLastSelectedCivilianIndex >= NUMMODELSPERPEDGROUP)
+			gLastSelectedCivilianIndex = 0;
+		return ms_pPedGroups[group].models[gLastSelectedCivilianIndex];
+	}
 }
 
 // returns eCopType
@@ -332,54 +354,17 @@ CPopulation::ChooseGangOccupation(int gangId)
 	return CGangs::ChooseGangPedModel(gangId);
 }
 
-//--MIAMI: done
 void
 CPopulation::DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool forceIndustrialZone)
 {
 }
 
 void
-CPopulation::FindCollisionZoneForCoors(CVector *coors, int *safeZoneOut, eLevelName *levelOut)
-{
-	*safeZoneOut = -1;
-	for (int i = 0; i < ARRAY_SIZE(aSafeZones); i++) {
-		if (coors->x > aSafeZones[i].x1 && coors->x < aSafeZones[i].x2) {
-			if (coors->y > aSafeZones[i].y1 && coors->y < aSafeZones[i].y2) {
-				if (coors->z > aSafeZones[i].z1 && coors->z < aSafeZones[i].z2)
-					*safeZoneOut = i;
-			}
-		}
-	}
-	// Then it's transition area
-	if (*safeZoneOut >= 0)
-		*levelOut = LEVEL_GENERIC;
-	else
-		*levelOut = CTheZones::GetLevelFromPosition(coors);
-}
-
-void
-CPopulation::FindClosestZoneForCoors(CVector *coors, int *safeZoneOut, eLevelName level1, eLevelName level2)
-{
-	float minDist = 10000000.0f;
-	int closestSafeZone = -1;
-	for (int i = 0; i < ARRAY_SIZE(aSafeZones); i++) {
-		if ((level1 == aSafeZones[i].srcLevel || level1 == aSafeZones[i].destLevel) && (level2 == aSafeZones[i].srcLevel || level2 == aSafeZones[i].destLevel)) {
-			CVector2D safeZoneDistVec(coors->x - (aSafeZones[i].x1 + aSafeZones[i].x2) * 0.5f, coors->y - (aSafeZones[i].y1 + aSafeZones[i].y2) * 0.5f);
-			float safeZoneDist = safeZoneDistVec.Magnitude();
-			if (safeZoneDist < minDist) {
-				minDist = safeZoneDist;
-				closestSafeZone = i;
-			}
-		}
-	}
-	*safeZoneOut = closestSafeZone;
-}
-
-void
 CPopulation::Update(bool addPeds)
 {
 	if (!CReplay::IsPlayingBack()) {
 		ManagePopulation();
+		RemovePedsIfThePoolGetsFull();
 		MoveCarsAndPedsOutOfAbandonedZones();
 		if (m_CountDownToPedsAtStart != 0) {
 			if (--m_CountDownToPedsAtStart == 0)
@@ -406,7 +391,7 @@ CPopulation::Update(bool addPeds)
 void
 CPopulation::GeneratePedsAtStartOfGame()
 {
-	for (int i = 0; i < 50; i++) {
+	for (int i = 0; i < 100; i++) {
 		ms_nTotalCivPeds = ms_nNumCivFemale + ms_nNumCivMale;
 		ms_nTotalGangPeds = ms_nNumGang9 + ms_nNumGang8 + ms_nNumGang7
 			+ ms_nNumGang6 + ms_nNumGang5 + ms_nNumGang4
@@ -421,20 +406,6 @@ CPopulation::GeneratePedsAtStartOfGame()
 	}
 }
 
-bool
-CPopulation::IsPointInSafeZone(CVector *coors)
-{
-	for (int i = 0; i < ARRAY_SIZE(aSafeZones); i++) {
-		if (coors->x > aSafeZones[i].x1 && coors->x < aSafeZones[i].x2) {
-			if (coors->y > aSafeZones[i].y1 && coors->y < aSafeZones[i].y2) {
-				if (coors->z > aSafeZones[i].z1 && coors->z < aSafeZones[i].z2)
-					return true;
-			}
-		}
-	}
-	return false;
-}
-
 // More speed = wider area to spawn peds
 float
 CPopulation::PedCreationDistMultiplier()
@@ -556,8 +527,10 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
 	int pedAmount;
 
 	CZoneInfo zoneInfo;
+	int32 man = -1, woman = -1;
 	CPed *gangLeader = nil;
 	bool addCop = false;
+	bool isSecurityGuard = false;
 	bool forceAddingCop = false;
 	CPlayerInfo *playerInfo = &CWorld::Players[CWorld::PlayerInFocus];
 	CVector playerCentreOfWorld = FindPlayerCentreOfWorld(CWorld::PlayerInFocus);
@@ -580,9 +553,25 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
 			maxDist = PedCreationDistMultiplier() * (MIN_CREATION_DIST + CREATION_RANGE);
 		}
 	}
+	float missionAndWeatherMult = -0.8f * Sqrt(CWeather::Rain) + 1.0f;
+
+	// Taxi side mission
+	if (CTheScripts::IsPlayerOnAMission()) {
+		CPed *player = FindPlayerPed();
+		if (player && player->InVehicle()) {
+			int32 model = player->m_pMyVehicle->GetModelIndex();
+			if (model == MI_TAXI || model == MI_CABBIE || model == MI_ZEBRA || model == MI_KAUFMAN)
+				missionAndWeatherMult = 1.0f;
+		}
+	}
+	if (CDarkel::FrenzyOnGoing())
+		missionAndWeatherMult = 1.0f;
+	int selectedMaxPeds = CGame::IsInInterior() ? CPopulation::MaxNumberOfPedsInUseInterior : CPopulation::MaxNumberOfPedsInUse;
+
 	// Yeah, float
-	float maxPossiblePedsForArea = (zoneInfo.pedDensity + zoneInfo.carDensity) * playerInfo->m_fRoadDensity * PedDensityMultiplier * CIniFile::PedNumberMultiplier;
-	maxPossiblePedsForArea = Min(maxPossiblePedsForArea, MaxNumberOfPedsInUse);
+	float maxPossiblePedsForArea = (zoneInfo.pedDensity + zoneInfo.carDensity) * playerInfo->m_fRoadDensity * PedDensityMultiplier
+		* (CDarkel::FrenzyOnGoing() ? 1.f : CIniFile::PedNumberMultiplier) * missionAndWeatherMult;
+	maxPossiblePedsForArea = Min(maxPossiblePedsForArea, selectedMaxPeds);
 
 	if (ms_nTotalPeds < maxPossiblePedsForArea || addCop) {
 		int decisionThreshold = CGeneral::GetRandomNumberInRange(0, 1000);
@@ -590,39 +579,48 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
 			pedTypeToAdd = PEDTYPE_COP;
 			modelToAdd = ChoosePolicePedOccupation();
 		} else {
-			for (int i = 0; i < NUM_GANGS; i++) {
+			int i = 0;
+			for (i = 0; i < NUM_GANGS; i++) {
 				if (decisionThreshold < zoneInfo.gangPedThreshold[i]) {
-					pedTypeToAdd = PEDTYPE_GANG1 + i;
 					break;
 				}
+			}
 
-				if (i == NUM_GANGS - 1) {
+			if (i == NUM_GANGS) {
+				if (CGeneral::GetRandomNumberInRange(0.0f, 1.0f) <= 0.95f) {
 					modelToAdd = ChooseCivilianOccupation(zoneInfo.pedGroup);
+
 					if (modelToAdd == -1)
 						return;
 					pedTypeToAdd = ((CPedModelInfo*)CModelInfo::GetModelInfo(modelToAdd))->m_pedType;
+
+				} else {
+					ChooseCivilianCoupleOccupations(zoneInfo.pedGroup, man, woman);
+					if (man == -1 || woman == -1)
+						return;
+					pedTypeToAdd = ((CPedModelInfo*)CModelInfo::GetModelInfo(woman))->m_pedType;
 				}
+			} else {
+				pedTypeToAdd = PEDTYPE_GANG1 + i;
 
+				if (IsSecurityGuard((ePedType)pedTypeToAdd)) {
+					isSecurityGuard = true;
+					modelToAdd = ChooseGangOccupation(pedTypeToAdd - PEDTYPE_GANG1);
+
+					if (modelToAdd == -1)
+						return;
+					pedTypeToAdd = ((CPedModelInfo*)CModelInfo::GetModelInfo(modelToAdd))->m_pedType;
+
+				}
 			}
 		}
 		if (!addCop && m_AllRandomPedsThisType > PEDTYPE_PLAYER1)
 			pedTypeToAdd = m_AllRandomPedsThisType;
 
-		if (pedTypeToAdd >= PEDTYPE_GANG1 && pedTypeToAdd <= PEDTYPE_GANG9) {
-			int randVal = CGeneral::GetRandomNumber() % 100;
-			if (randVal < 50)
-				return;
-
-			if (randVal < 57) {
-				pedAmount = 1;
-			} else if (randVal >= 74) {
-				if (randVal >= 85)
-					pedAmount = 4;
-				else
-					pedAmount = 3;
-			} else {
-				pedAmount = 2;
-			}
+		if (pedTypeToAdd >= PEDTYPE_GANG1 && pedTypeToAdd <= PEDTYPE_GANG9 && !isSecurityGuard) {
+			minDist += 30.0f;
+			maxDist += 30.0f;
+			pedAmount = ComputeRandomisedGangSize();
 		} else
 			pedAmount = 1;
 
@@ -635,35 +633,59 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
 		if (!foundCoors)
 			return;
 
+		uint8 nodeSpawnRate = Min(ThePaths.m_pathNodes[node1].spawnRate, ThePaths.m_pathNodes[node2].spawnRate);
+		int randomRate = CGeneral::GetRandomNumber() & 0xF;
+		if (randomRate > nodeSpawnRate)
+			return;
+
+		CPathFind::TakeWidthIntoAccountForCoors(&ThePaths.m_pathNodes[node1], &ThePaths.m_pathNodes[node2], CGeneral::GetRandomNumber(), &generatedCoors.x, &generatedCoors.y);
+		if (CGame::currArea == AREA_MALL && (pedTypeToAdd == PEDTYPE_CIVMALE || pedTypeToAdd == PEDTYPE_CIVFEMALE || pedTypeToAdd == PEDTYPE_CRIMINAL) &&
+			CGeneral::GetRandomNumberInRange(0.f, 1.f) > 0.5f) {
+
+			PlaceMallPedsAsStationaryGroup(generatedCoors, zoneInfo.pedGroup);
+			return;
+		}
+
+		if (pedTypeToAdd >= PEDTYPE_GANG1 && pedTypeToAdd <= PEDTYPE_GANG9 && !isSecurityGuard) {
+			PlaceGangMembers((ePedType)pedTypeToAdd, pedAmount, generatedCoors);
+			return;
+		}
+
+		if (man > -1 && woman > -1) {
+			PlaceCouple(PEDTYPE_CIVMALE, man, PEDTYPE_CIVFEMALE, woman, generatedCoors);
+			return;
+		}
+
 		for (int i = 0; i < pedAmount; ++i) {
-			if (pedTypeToAdd >= PEDTYPE_GANG1 && pedTypeToAdd <= PEDTYPE_GANG9)
-				modelToAdd = ChooseGangOccupation(pedTypeToAdd - PEDTYPE_GANG1);
 
 			if (pedTypeToAdd == PEDTYPE_COP) {
 				// Unused code, ChoosePolicePedOccupation returns COP_STREET. Spawning FBI/SWAT/Army done in somewhere else.
 				if (modelToAdd == COP_STREET) {
-					if (!CModelInfo::GetModelInfo(MI_COP)->GetRwObject())
+					if (!CStreaming::HasModelLoaded(MI_COP))
 						return;
 
 				} else if (modelToAdd == COP_FBI) {
-					if (!CModelInfo::GetModelInfo(MI_FBI)->GetRwObject())
+					if (!CStreaming::HasModelLoaded(MI_COP) || !CStreaming::HasModelLoaded(CWeaponInfo::GetWeaponInfo(WEAPONTYPE_MP5)->m_nModelId))
 						return;
 
 				} else if (modelToAdd == COP_SWAT) {
-					if (!CModelInfo::GetModelInfo(MI_SWAT)->GetRwObject())
+					if (!CStreaming::HasModelLoaded(MI_SWAT) || !CStreaming::HasModelLoaded(CWeaponInfo::GetWeaponInfo(WEAPONTYPE_UZI)->m_nModelId))
 						return;
 
-				} else if (modelToAdd == COP_ARMY && !CModelInfo::GetModelInfo(MI_ARMY)->GetRwObject()) {
-					return;
+				} else if (modelToAdd == COP_ARMY) {
+					if (!CStreaming::HasModelLoaded(MI_ARMY) ||
+						!CStreaming::HasModelLoaded(CWeaponInfo::GetWeaponInfo(WEAPONTYPE_MP5)->m_nModelId) || !CStreaming::HasModelLoaded(CWeaponInfo::GetWeaponInfo(WEAPONTYPE_GRENADE)->m_nModelId))
+						return;
 				}
-			} else if (!CModelInfo::GetModelInfo(modelToAdd)->GetRwObject()) {
+			} else if (!CStreaming::HasModelLoaded(modelToAdd)) {
 				return;
 			}
 			generatedCoors.z += 0.7f;
 
 			// What? How can this not be met?
 			if (i < pedAmount) {
-				//rand()
+				// rand()
+				// III leftover, unused
 				if (gangLeader) {
 					// Align gang members in formation. (btw i can't be 0 in here)
 					float offsetMin = i * 0.75f;
@@ -690,32 +712,81 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
 
 				generatedCoors.z = Max(generatedCoors.z, groundZ);
 			}
-			bool farEnoughToAdd = true;
-			CMatrix mat(TheCamera.GetCameraMatrix());
-			if (TheCamera.IsSphereVisible(generatedCoors, 2.0f, &mat)) {
+			bool surfaceAndDistIsOk = true;
+			if (TheCamera.IsSphereVisible(generatedCoors, 2.0f)) {
 				if (PedCreationDistMultiplier() * MIN_CREATION_DIST > (generatedCoors - playerCentreOfWorld).Magnitude2D())
-					farEnoughToAdd = false;
+					surfaceAndDistIsOk = false;
+			}
+
+			// Place skaters if only they're on tarmac.
+			if (((CPedModelInfo*)CModelInfo::GetModelInfo(modelToAdd))->m_pedStatType == PEDSTAT_SKATER) {
+				CEntity* foundEnt = nil;
+				CColPoint foundCol;
+				CWorld::ProcessVerticalLine(generatedCoors + CVector(0.f, 0.f, 2.f), generatedCoors.z - 2.0f, foundCol, foundEnt, true, false, false, false, false, false, nil);
+				if (foundEnt) {
+					if (foundCol.surfaceB == SURFACE_TARMAC || foundCol.surfaceB == SURFACE_PAVEMENT)
+						surfaceAndDistIsOk = true;
+					else
+						surfaceAndDistIsOk = false;
+
+				} else {
+					surfaceAndDistIsOk = false;
+				}
 			}
-			if (!farEnoughToAdd)
+			if (!surfaceAndDistIsOk)
 				break;
 			CPed *newPed = AddPed((ePedType)pedTypeToAdd, modelToAdd, generatedCoors);
 			if (forceAddingCop && newPed->m_nPedType == PEDTYPE_COP)
 				((CCopPed*)newPed)->m_bThrowsSpikeTrap = true;
 
-			newPed->SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
-
+			bool gonnaSunbathe = false;
+			if (CPopulation::IsSunbather(modelToAdd)) {
+				CEntity* foundEnt = nil;
+				CColPoint foundCol;
+				CWorld::ProcessVerticalLine(generatedCoors + CVector(0.f, 0.f, 2.f), generatedCoors.z - 2.0f, foundCol, foundEnt, true, false, false, false, false, false, nil);
+				if (foundEnt) {
+					if ((foundCol.surfaceB == SURFACE_CONCRETE_BEACH || foundCol.surfaceB == SURFACE_SAND)
+						&& CClock::GetHours() >= 10 && CClock::GetHours() <= 18 && 0.0f == CWeather::Rain) {
+						gonnaSunbathe = true;
+						if (CPedPlacement::IsPositionClearForPed(generatedCoors, 3.0f, ARRAY_SIZE(gSunbatheObstacles), gSunbatheObstacles)) {
+							for (int j = 0; j < ARRAY_SIZE(gSunbatheObstacles); j++) {
+								if (gSunbatheObstacles[j] && gSunbatheObstacles[j] != newPed)
+									gonnaSunbathe = false;
+							}
+						}
+					}
+				}
+			}
+			if (gonnaSunbathe) {
+				float heading = CGeneral::GetRandomNumberInRange(0.f, 1.f) * TWOPI;
+				newPed->m_fRotationDest = heading;
+				newPed->m_fRotationCur = heading;
+				// unused
+				// v61 = CGeneral::GetRandomTrueFalse();
+				newPed->SetWaitState(WAITSTATE_SUN_BATHE_IDLE, nil);
+				CVector toyPos(newPed->GetPosition());
+				float waterLevel;
+				if (CWaterLevel::GetGroundLevel(toyPos, &waterLevel, nil, 30.0f)) {
+					toyPos.z = 0.004f + waterLevel;
+					CEntity *toy = CWaterLevel::CreateBeachToy(toyPos, BEACHTOY_11);
+					if (toy)
+						toy->SetHeading(heading);
+
+					if (!(CGeneral::GetRandomNumber() & 3)) {
+						CWaterLevel::CreateBeachToy(toyPos + CVector(CGeneral::GetRandomNumberInRange(-2.f, 2.f), CGeneral::GetRandomNumberInRange(-2.f, 2.f), 0.f), BEACHTOY_6);
+					}
+				}
+			} else {
+				newPed->SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
+			}
+			
 			if (i != 0) {
 				// Gang member
 				newPed->SetLeader(gangLeader);
-#ifndef FIX_BUGS
-				// seems to be a miami leftover (this code is not on PS2) but gang peds end up just being frozen
-				newPed->m_nPedState = PED_UNKNOWN;
-				gangLeader->m_nPedState = PED_UNKNOWN;
-				newPed->m_fRotationCur = CGeneral::GetRadianAngleBetweenPoints(
-					gangLeader->GetPosition().x, gangLeader->GetPosition().y,
-					newPed->GetPosition().x, newPed->GetPosition().y);
-				newPed->m_fRotationDest = newPed->m_fRotationCur;
-#endif
+
+				newPed->SetPedState(PED_UNKNOWN);
+				gangLeader->SetPedState(PED_UNKNOWN);
+
 			} else {
 				gangLeader = newPed;
 			}
@@ -730,7 +801,6 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
 	}
 }
 
-// TODO(Miami)
 CPed*
 CPopulation::AddPedInCar(CVehicle* car, bool isDriver)
 {
@@ -779,11 +849,15 @@ CPopulation::AddPedInCar(CVehicle* car, bool isDriver)
 					preferredModel = MI_TAXI_D;
 					break;
 				}
-			} else if (car->GetModelIndex() == MI_VICECHEE && car->bIsLawEnforcer) {
-				preferredModel = COP_MIAMIVICE;
-				pedType = PEDTYPE_COP;
-				miamiViceIndex = (isDriver ? 2 * CCarCtrl::MiamiViceCycle : 2 * CCarCtrl::MiamiViceCycle + 1);
-				break;
+				// fall through if not
+			} else if (car->GetModelIndex() == MI_VICECHEE) {
+				if (car->bIsLawEnforcer) {
+					preferredModel = COP_MIAMIVICE;
+					pedType = PEDTYPE_COP;
+					miamiViceIndex = (isDriver ? 2 * CCarCtrl::MiamiViceCycle : 2 * CCarCtrl::MiamiViceCycle + 1);
+					break;
+				}
+				// fall through if not
 			}
 
 			int gangOfPed = 0;
@@ -796,20 +870,20 @@ CPopulation::AddPedInCar(CVehicle* car, bool isDriver)
 				pedType = gangOfPed + PEDTYPE_GANG1;
 				preferredModel = ChooseGangOccupation(gangOfPed);
 			} else if (gangOfPed == NUM_GANGS) {
-			    CVehicleModelInfo *carModelInfo = ((CVehicleModelInfo *)CModelInfo::GetModelInfo(car->GetModelIndex()));
+			    CVehicleModelInfo *carModel = ((CVehicleModelInfo *)CModelInfo::GetModelInfo(car->GetModelIndex()));
+				preferredModel = ChooseCivilianOccupation(zoneInfo.pedGroup);
 				int i = 15;
 				for(; i >= 0; i--) {
-					// Should return random model each time
-					preferredModel = ChooseCivilianOccupation(zoneInfo.pedGroup);
-					if (preferredModel == -1)
-						preferredModel = defaultModel;
+					CPedModelInfo* pedModel = (CPedModelInfo*)CModelInfo::GetModelInfo(preferredModel);
 
-					if (((CPedModelInfo*)CModelInfo::GetModelInfo(preferredModel))->GetRwObject()) {
+					if (pedModel->GetRwObject()) {
 						if (!car->IsPassenger(preferredModel) && !car->IsDriver(preferredModel)) {
-							if (((CPedModelInfo*)CModelInfo::GetModelInfo(preferredModel))->m_carsCanDrive & (1 << carModelInfo->m_vehicleClass))
+							if (((CPedModelInfo*)CModelInfo::GetModelInfo(preferredModel))->m_carsCanDrive & (1 << carModel->m_vehicleClass))
 								break;
 						}
 					}
+
+					preferredModel = ChooseNextCivilianOccupation(zoneInfo.pedGroup);
 				}
 				if (i == -1)
 					preferredModel = defaultModel;
@@ -900,7 +974,7 @@ bool
 CPopulation::TestRoomForDummyObject(CObject *obj)
 {
 	int16 collidingObjs;
-	CWorld::FindObjectsKindaColliding(obj->m_objectMatrix.GetPosition(), CModelInfo::GetModelInfo(obj->GetModelIndex())->GetColModel()->boundingSphere.radius,
+	CWorld::FindObjectsKindaColliding(obj->m_objectMatrix.GetPosition(), obj->GetBoundRadius(),
 		false, &collidingObjs, 2, nil, false, true, true, false, false);
 
 	return collidingObjs == 0;
@@ -975,17 +1049,20 @@ CPopulation::ManagePopulation(void)
 	for (int i = objectPoolSize * frameMod32 / 32; i < objectPoolSize * (frameMod32 + 1) / 32; i++) {
 		CObject *obj = CPools::GetObjectPool()->GetSlot(i);
 		if (obj && obj->CanBeDeleted()) {
-			if ((obj->GetPosition() - playerPos).Magnitude() <= 80.0f ||
-				(obj->m_objectMatrix.GetPosition() - playerPos).Magnitude() <= 80.0f) {
-				if (obj->ObjectCreatedBy == TEMP_OBJECT && CTimer::GetTimeInMilliseconds() > obj->m_nEndOfLifeTime) {
+			float objPlayerDist = (obj->GetPosition() - playerPos).Magnitude();
+			if (obj->ObjectCreatedBy == TEMP_OBJECT) {
+				if (obj->GetModelIndex() != MI_ROADWORKBARRIER1 && obj->GetModelIndex() != MI_BEACHBALL) {
+					if (objPlayerDist > 51.0f || objPlayerDist > 25.0f && !obj->GetIsOnScreen() || CTimer::GetTimeInMilliseconds() > obj->m_nEndOfLifeTime) {
+						CWorld::Remove(obj);
+						delete obj;
+					}
+				} else if (objPlayerDist > 120.0f) {
 					CWorld::Remove(obj);
 					delete obj;
 				}
-			} else {
-				if (obj->ObjectCreatedBy == TEMP_OBJECT) {
-					CWorld::Remove(obj);
-					delete obj;
-				} else if (obj->ObjectCreatedBy != CUTSCENE_OBJECT && TestRoomForDummyObject(obj)) {
+
+			} else if (objPlayerDist > 80.0f && (obj->m_objectMatrix.GetPosition() - playerPos).Magnitude() > 80.0f) {
+				if (obj->ObjectCreatedBy != CUTSCENE_OBJECT && TestRoomForDummyObject(obj)) {
 					ConvertToDummyObject(obj);
 				}
 			}
@@ -996,7 +1073,7 @@ CPopulation::ManagePopulation(void)
 	int dummyPoolSize = CPools::GetDummyPool()->GetSize();
 	for (int i = dummyPoolSize * frameMod32 / 32; i < dummyPoolSize * (frameMod32 + 1) / 32; i++) {
 		CDummy *dummy = CPools::GetDummyPool()->GetSlot(i);
-		if (dummy) {
+		if (dummy && (dummy->m_area == CGame::currArea || dummy->m_area == AREA_EVERYWHERE)) {
 			if ((dummy->GetPosition() - playerPos).Magnitude() < 80.0f)
 				ConvertToRealObject((CDummyObject*)dummy);
 		}
@@ -1011,7 +1088,8 @@ CPopulation::ManagePopulation(void)
 		CPed *ped = CPools::GetPedPool()->GetSlot(poolIndex);
 
 		if (ped && !ped->IsPlayer() && ped->CanBeDeleted() && !ped->bInVehicle) {
-			if (ped->m_nPedState == PED_DEAD && CTimer::GetTimeInMilliseconds() - ped->m_bloodyFootprintCountOrDeathTime > 60000)
+			uint32 timeSinceDeath = CTimer::GetTimeInMilliseconds() - ped->m_bloodyFootprintCountOrDeathTime;
+			if (ped->m_nPedState == PED_DEAD && (timeSinceDeath > 30000 || CDarkel::FrenzyOnGoing() && timeSinceDeath > 15000))
 				ped->bFadeOut = true;
 
 			if (ped->bFadeOut && CVisibilityPlugins::GetClumpAlpha(ped->GetClump()) == 0) {
@@ -1020,22 +1098,33 @@ CPopulation::ManagePopulation(void)
 			}
 
 			float dist = (ped->GetPosition() - playerPos).Magnitude2D();
+			bool pedIsFarAway = false;
 
-			if (ped->IsGangMember() || (ped->bDeadPedInFrontOfCar && ped->m_vehicleInAccident))
+			if (ped->IsGangMember())
 				dist -= 30.0f;
+			else if (ped->bDeadPedInFrontOfCar && ped->m_vehicleInAccident)
+				dist = 0.0f;
 
-			bool pedIsFarAway = false;
-			if (PedCreationDistMultiplier() * (PED_REMOVE_DIST_SPECIAL * TheCamera.GenerationDistMultiplier) < dist
-				|| (!ped->bCullExtraFarAway && PedCreationDistMultiplier() * PED_REMOVE_DIST * TheCamera.GenerationDistMultiplier < dist)
-				|| (PedCreationDistMultiplier() * (MIN_CREATION_DIST + CREATION_RANGE) * OFFSCREEN_CREATION_MULT < dist
-				&& !ped->GetIsOnScreen()
-				&& TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_SNIPER
-				&& TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_SNIPER_RUNABOUT
-				&& !TheCamera.Cams[TheCamera.ActiveCam].LookingLeft
-				&& !TheCamera.Cams[TheCamera.ActiveCam].LookingRight
-				&& !TheCamera.Cams[TheCamera.ActiveCam].LookingBehind))
+			if (PedCreationDistMultiplier() * (PED_REMOVE_DIST_SPECIAL * TheCamera.GenerationDistMultiplier) < dist ||
+				(!ped->bCullExtraFarAway && PedCreationDistMultiplier() * PED_REMOVE_DIST * TheCamera.GenerationDistMultiplier < dist)) {
 				pedIsFarAway = true;
 
+			} else if (PedCreationDistMultiplier() * (MIN_CREATION_DIST + CREATION_RANGE) * OFFSCREEN_CREATION_MULT < dist) {
+				if (CTimer::GetTimeInMilliseconds() > ped->m_nExtendedRangeTimer && !ped->GetIsOnScreen()) {
+					if (TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_SNIPER
+						&& TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_SNIPER_RUNABOUT
+						&& TheCamera.Cams[TheCamera.ActiveCam].Mode != CCam::MODE_CAMERA
+						&& !TheCamera.Cams[TheCamera.ActiveCam].LookingLeft
+						&& !TheCamera.Cams[TheCamera.ActiveCam].LookingRight
+						&& !TheCamera.Cams[TheCamera.ActiveCam].LookingBehind) {
+						pedIsFarAway = true;
+					}
+				}
+						
+			} else {
+				ped->m_nExtendedRangeTimer = ped->m_nPedType == PEDTYPE_COP ? CTimer::GetTimeInMilliseconds() + 10000 : CTimer::GetTimeInMilliseconds() + 4000;
+			}
+
 			if (!pedIsFarAway)
 				continue;
 
@@ -1074,24 +1163,18 @@ CPopulation::ManagePopulation(void)
 CPed* 
 CPopulation::AddDeadPedInFrontOfCar(const CVector& pos, CVehicle* pCulprit)
 {
-	if (TheCamera.IsSphereVisible(pos, 2.0f)) {
-		float fDistanceToPlayer = (pos - FindPlayerPed()->GetPosition()).Magnitude2D();
-		float fDistanceMultiplier;
-		if (FindPlayerVehicle())
-			fDistanceMultiplier = clamp(FindPlayerVehicle()->GetMoveSpeed().Magnitude2D() - 0.1f + 1.0f, 1.0f, 1.5f);
-		else
-			fDistanceMultiplier = 1.0f;
-		if (40.0f * fDistanceMultiplier > fDistanceToPlayer)
+	if (TheCamera.IsSphereVisible(pos, 2.0f) && MIN_CREATION_DIST * PedCreationDistMultiplier() > (pos - FindPlayerPed()->GetPosition()).Magnitude2D()) {
 			return nil;
 	}
+
 	bool found;
 	float z = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, pos.z, &found) + 1.0f;
 	if (!found)
 		return nil;
 	z = Max(z, pos.z);
-	if (!CModelInfo::GetModelInfo(MI_MALE01)->GetRwObject()) // strange way to check it
+	if (!CModelInfo::GetModelInfo(MI_MALE01)->GetRwObject())
 		return nil;
-	CPed* pPed = CPopulation::AddPed(PEDTYPE_CIVMALE, MI_MALE01, pos); // TODO(MIAMI): 4th parameter
+	CPed* pPed = CPopulation::AddPed(PEDTYPE_CIVMALE, MI_MALE01, pos);
 	pPed->SetDie();
 	pPed->m_nPedMoney = 0;
 	pPed->bDeadPedInFrontOfCar = true;
@@ -1101,16 +1184,14 @@ CPopulation::AddDeadPedInFrontOfCar(const CVector& pos, CVehicle* pCulprit)
 	if (!CPedPlacement::IsPositionClearForPed(pos, 2.0f, 3, pEntities)) {
 		for (int i = 0; i < 3; i++) {
 			if (pEntities[i] && pEntities[i] != pCulprit && pEntities[i] != pPed) {
-				CWorld::Remove(pPed);
-				delete pPed;
+				RemovePed(pPed);
 				return nil;
 			}
 		}
 	}
 	CColPoint colpts[MAX_COLLISION_POINTS];
 	if (CCollision::ProcessColModels(pCulprit->GetMatrix(), *pCulprit->GetColModel(), pPed->GetMatrix(), *pPed->GetColModel(), colpts, nil, nil)) {
-		CWorld::Remove(pPed);
-		delete pPed;
+		RemovePed(pPed);
 		return nil;
 	}
 	CVisibilityPlugins::SetClumpAlpha(pPed->GetClump(), 0);
@@ -1133,4 +1214,583 @@ bool
 CPopulation::CanJeerAtStripper(int32 model)
 {
 	return model == MI_WMOBE || model == MI_WMYBE || model == MI_WMOST || model == MI_BMYBB;
+}
+
+void
+CPopulation::RemovePedsIfThePoolGetsFull(void)
+{
+	if ((CTimer::GetFrameCounter() & 7) == 5) {
+		if (CPools::GetPedPool()->GetNoOfFreeSpaces() < 8) {
+			CPed *closestPed = nil;
+			float closestDist = 10000000.0;
+			int poolSize = CPools::GetPedPool()->GetSize();
+			for (int i = poolSize - 1; i >= 0; i--) {
+				CPed* ped = CPools::GetPedPool()->GetSlot(i);
+				if (ped && ped->CanBeDeleted()) {
+					float dist = (TheCamera.GetPosition() - ped->GetPosition()).Magnitude();
+					if (dist < closestDist) {
+						closestDist = dist;
+						closestPed = ped;
+					}
+				}
+			}
+			if (closestPed) {
+				RemovePed(closestPed);
+			}
+		}
+	}
+}
+
+bool
+CPopulation::IsMale(int32 model)
+{
+	switch (model) {
+		case MI_HMYST:
+		case MI_HMOST:
+		case MI_HMYRI:
+		case MI_HMORI:
+		case MI_HMYBE:
+		case MI_HMOBE:
+		case MI_HMOTR:
+		case MI_HMYAP:
+		case MI_HMOCA:
+		case MI_BMODK:
+		case MI_BMYKR:
+		case MI_BMYST:
+		case MI_BMOST:
+		case MI_BMYRI:
+		case MI_BMYBE:
+		case MI_BMOBE:
+		case MI_BMYBU:
+		case MI_BMOTR:
+		case MI_BMYPI:
+		case MI_BMYBB:
+		case MI_WMYCR:
+		case MI_WMYST:
+		case MI_WMOST:
+		case MI_WMYRI:
+		case MI_WMORI:
+		case MI_WMYBE:
+		case MI_WMOBE:
+		case MI_WMYCW:
+		case MI_WMYGO:
+		case MI_WMOGO:
+		case MI_WMYLG:
+		case MI_WMYBU:
+		case MI_WMOBU:
+		case MI_WMOTR:
+		case MI_WMYPI:
+		case MI_WMOCA:
+		case MI_WMYJG:
+		case MI_WMYSK:
+
+		// BUG? Why no JMOTO?
+			return true;
+		default:
+			return false;
+	}
+}
+
+bool
+CPopulation::IsFemale(int32 model)
+{
+	switch (model) {
+		case MI_HFYST:
+		case MI_HFOST:
+		case MI_HFYRI:
+		case MI_HFORI:
+		case MI_HFYBE:
+		case MI_HFOBE:
+		case MI_HFYBU:
+		case MI_HFYMD:
+		case MI_HFYCG:
+		case MI_HFYPR:
+		case MI_HFOTR:
+		case MI_BFYST:
+		case MI_BFOST:
+		case MI_BFYRI:
+		case MI_BFORI:
+		case MI_BFYBE:
+		case MI_BFOBE:
+		case MI_BFYPR:
+		case MI_BFOTR:
+		case MI_WFYST:
+		case MI_WFOST:
+		case MI_WFYRI:
+		case MI_WFORI:
+		case MI_WFYBE:
+		case MI_WFOBE:
+		case MI_WFOGO:
+		case MI_WFYLG:
+		case MI_WFYBU:
+		case MI_WFYPR:
+		case MI_WFOTR:
+		case MI_WFYJG:
+		case MI_WFYSK:
+		case MI_WFYSH:
+		case MI_WFOSH:
+		case MI_JFOTO:
+			return true;
+		default:
+			return false;
+	}
+}
+
+bool
+CPopulation::IsSunbather(int32 model)
+{
+	switch (model) {
+		case MI_HFYBE:
+		case MI_HFOBE:
+		case MI_HMYBE:
+		case MI_HMOBE:
+		case MI_BFYBE:
+		case MI_BMYBE:
+		case MI_BFOBE:
+		case MI_BMOBE:
+		case MI_WFYBE:
+		case MI_WMYBE:
+		case MI_WFOBE:
+		case MI_WMOBE:
+			return true;
+		default:
+			return false;
+	}
+}
+
+int32
+CPopulation::ComputeRandomisedGangSize(void)
+{
+	return CGeneral::GetRandomNumberInRange(3, 6);
+}
+
+bool
+CPopulation::CanSolicitPlayerInCar(int32 model)
+{
+	return model == MI_HFYPR || model == MI_BFYPR || model == MI_WFYPR;
+}
+
+bool
+CPopulation::CanSolicitPlayerOnFoot(int32 model)
+{
+	return model == MI_HFYMD || model == MI_HFYCG || model == MI_BFOTR || model == MI_BMOTR || model == MI_WFOTR || model == MI_WMOTR;
+}
+
+bool
+CPopulation::IsSecurityGuard(ePedType pedType)
+{
+	return pedType == PEDTYPE_GANG5;
+}
+
+void
+CPopulation::ChooseCivilianCoupleOccupations(int32 group, int32& man, int32& woman)
+{
+	man = -1;
+	woman = -1;
+	
+	for (int i = 0; i < 8; i++) {
+		if (man > -1)
+			break;
+
+		int32 model = ms_pPedGroups[group].models[CGeneral::GetRandomNumberInRange(0, NUMMODELSPERPEDGROUP)];
+		if (man == -1 && IsMale(model) && ((CPedModelInfo*)CModelInfo::GetModelInfo(model))->m_pedType == PEDTYPE_CIVMALE) {
+			man = model;
+		}
+	}
+
+	if (man != -1) {
+		int32 model;
+		for (int i = 0; i < NUMMODELSPERPEDGROUP; i++) {
+			model = ms_pPedGroups[group].models[i];
+			if (IsFemale(model)) {
+				CPedModelInfo* womanModelInfo = (CPedModelInfo*)CModelInfo::GetModelInfo(model);
+				if (womanModelInfo->m_pedType == PEDTYPE_CIVFEMALE) {
+					CPedModelInfo* manModelInfo = (CPedModelInfo*)CModelInfo::GetModelInfo(man);
+
+					// If both are skater or not, finalize the decision
+					if (manModelInfo && womanModelInfo) {
+						if (manModelInfo->m_animGroup == womanModelInfo->m_animGroup) {
+							if (manModelInfo->m_pedStatType != PEDSTAT_SKATER && womanModelInfo->m_pedStatType != PEDSTAT_SKATER)
+								break;
+
+							if (manModelInfo->m_pedStatType == PEDSTAT_SKATER && womanModelInfo->m_pedStatType == PEDSTAT_SKATER)
+								break;
+						}
+					}
+				}
+			}
+		}
+		woman = model;
+	}
+}
+
+void
+CPopulation::PlaceGangMembers(ePedType pedType, int pedAmount, CVector const& coors)
+{
+	if (CGeneral::GetRandomNumberInRange(0.f, 1.f) < 0.333f) {
+		PlaceGangMembersInFormation(pedType, pedAmount, coors);
+	} else {
+		PlaceGangMembersInCircle(pedType, pedAmount, coors);
+	}
+}
+
+void
+CPopulation::PlaceGangMembersInFormation(ePedType pedType, int pedAmount, CVector const& coors)
+{
+	CPed *createdPeds[5];
+
+	if (!TheCamera.IsSphereVisible(coors, 3.0f) || MIN_CREATION_DIST * PedCreationDistMultiplier() <= (coors - FindPlayerPed()->GetPosition()).Magnitude2D()) {
+		if (CPedPlacement::IsPositionClearForPed(coors, 3.0f, -1, 0)) {
+			bool leaderFoundGround;
+			float leaderGroundZ = CWorld::FindGroundZFor3DCoord(coors.x, coors.y, coors.z, &leaderFoundGround) + 1.0f;
+			if (leaderFoundGround) {
+				float finalZ = coors.z > leaderGroundZ ? coors.z : leaderGroundZ;
+				int leaderModel = ChooseGangOccupation(pedType - PEDTYPE_GANG1);
+				if (((CPedModelInfo*)CModelInfo::GetModelInfo(leaderModel))->GetRwObject()) {
+					CPed *leader = AddPed(pedType, leaderModel, CVector(coors.x, coors.y, finalZ));
+					if (leader) {
+						leader->SetObjective(OBJECTIVE_NONE);
+						leader->SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
+						leader->bIsLeader = true;
+						if (CGangs::GetWillAttackPlayerWithCops(pedType))
+							leader->bCanAttackPlayerWithCops = true;
+
+						int pedIdx = 1;
+						createdPeds[0] = leader;
+						for (int i = 1; i < pedAmount; ++i) {
+							int memberModel = ChooseGangOccupation(pedType - PEDTYPE_GANG1);
+							if (!((CPedModelInfo*)CModelInfo::GetModelInfo(memberModel))->GetRwObject())
+								continue;
+
+							CPed* memberPed = AddPed(pedType, memberModel, CVector(coors.x, coors.y, finalZ));
+							if (!memberPed)
+								continue;
+
+							memberPed->SetObjective(OBJECTIVE_FOLLOW_CHAR_IN_FORMATION, leader);
+							memberPed->SetFormation((eFormation)i);
+							CVector formationPos = memberPed->GetFormationPosition();
+							CVector finalFormationPos = formationPos;
+							bool formationFoundGround;
+							float formationGroundZ = CWorld::FindGroundZFor3DCoord(formationPos.x, formationPos.y, 1.0f + formationPos.z, &formationFoundGround) + 1.0f;
+
+							finalFormationPos.z = Max(finalFormationPos.z, formationGroundZ);
+							if (formationFoundGround) {
+								if (Abs(finalFormationPos.z - leader->GetPosition().z) <= 1.0f) {
+									if (CWorld::GetIsLineOfSightClear(finalFormationPos, leader->GetPosition(), true, false, false, false, false, false, false)) {
+										memberPed->SetPosition(finalFormationPos);
+										createdPeds[pedIdx++] = memberPed;
+										if (CGangs::GetWillAttackPlayerWithCops(pedType))
+											leader->bCanAttackPlayerWithCops = true;
+
+										CVisibilityPlugins::SetClumpAlpha(memberPed->GetClump(), 0);
+										continue;
+									}
+								}
+							}
+							RemovePed(memberPed);
+						}
+						if (pedIdx >= 3) {
+							for (int j = 1; j < pedIdx; ++j)
+								createdPeds[j]->SetLeader(createdPeds[0]);
+
+						} else {
+							for (int k = 0; k < pedIdx; ++k) {
+								RemovePed(createdPeds[k]);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+void
+CPopulation::PlaceGangMembersInCircle(ePedType pedType, int pedAmount, CVector const& coors)
+{
+	CPed *createdPeds[5];
+
+	if (pedAmount < 2)
+		return;
+
+	float circleSector = TWOPI / pedAmount;
+
+	float circleR = Sqrt(0.5f / (1.0f - Cos(circleSector)));
+
+	if (!TheCamera.IsSphereVisible(coors, circleR) ||
+		MIN_CREATION_DIST * PedCreationDistMultiplier() <= (coors - FindPlayerPed()->GetPosition()).Magnitude2D()) {
+
+		if (CPedPlacement::IsPositionClearForPed(coors, circleR, -1, 0)) {
+			int pedIdx = 0;
+			CVector leaderPos;
+
+			for (int i = 0; i < pedAmount; i++) {	
+				float angleMult = i + CGeneral::GetRandomNumberInRange(-0.2f, 0.2f);
+				float randomR = circleR + CGeneral::GetRandomNumberInRange(-0.2f, 0.2f) * circleR;
+				float xOffset = randomR * Cos(angleMult * circleSector);
+				float yOffset = randomR * Sin(angleMult * circleSector);
+				bool foundGround;
+				float groundZ = CWorld::FindGroundZFor3DCoord(xOffset + coors.x, yOffset + coors.y, coors.z + 1.0, &foundGround) + 1.0f;
+				if (foundGround) {
+					CVector finalPos(coors.x + xOffset, coors.y + yOffset, coors.z > groundZ ? coors.z : groundZ);
+
+					if (i == 0)
+						leaderPos = finalPos;
+
+					int gangModel = ChooseGangOccupation(pedType - PEDTYPE_GANG1);
+					if (((CPedModelInfo*)CModelInfo::GetModelInfo(gangModel))->GetRwObject()) {
+						CEntity* obstacles[6] = { nil, nil, nil, nil, nil, nil };
+						CPedPlacement::IsPositionClearForPed(finalPos, CModelInfo::GetModelInfo(gangModel)->GetColModel()->boundingSphere.radius, ARRAY_SIZE(obstacles), obstacles);
+						bool foundObstacle = false;
+						for (int m = 0; m < ARRAY_SIZE(obstacles); m++) {
+							CEntity* obstacle = obstacles[m];
+							if (obstacle) {
+								int n = 0;
+								bool obstacleIsHarmless = false;
+								for (int n = 0; n < pedIdx; n++) {
+									if (obstacle == createdPeds[n])
+										obstacleIsHarmless = true;
+								}
+								if (!obstacleIsHarmless) {
+									foundObstacle = true;
+									break;
+								}
+							}
+						}
+						bool memberCanSeeLeader = i == 0 ? true : CWorld::GetIsLineOfSightClear(finalPos, leaderPos, true, false, false, false, false, false, false);
+
+						bool notTooCloseToLeader = i == 0 ? true : !(Abs(finalPos.z - leaderPos.z) < 1.0f);
+
+						if (!foundObstacle && memberCanSeeLeader && notTooCloseToLeader) {
+							CPed* newPed = AddPed(pedType, gangModel, finalPos);
+							if (newPed) {
+								createdPeds[pedIdx++] = newPed;
+								float angle = CGeneral::GetRadianAngleBetweenPoints(
+									coors.x, coors.y,
+									finalPos.x, finalPos.y);
+								newPed->m_fRotationDest = angle;
+								newPed->m_fRotationCur = angle;
+								if (CGangs::GetWillAttackPlayerWithCops(pedType))
+									newPed->bCanAttackPlayerWithCops = true;
+
+								CVisibilityPlugins::SetClumpAlpha(newPed->GetClump(), 0);
+							}
+							// No.
+#ifndef FIX_BUGS
+							else
+								CWorld::Remove(nil);
+#endif
+						}
+					}
+				}
+			}
+			if (pedIdx >= 3) {
+				for (int j = 0; j < pedIdx / 2; ++j) {
+					createdPeds[j]->SetChat(createdPeds[pedIdx - 1 - j], 100000);
+					createdPeds[pedIdx - 1 - j]->SetChat(createdPeds[j], 100000);
+				}
+
+				// Make that extra guy in the middle stand there(PED_UNKNOWN locks him) and do nothing :lmao:
+				if (pedIdx % 2 != 0) {
+					CPed *tmim = createdPeds[(pedIdx - 1) / 2];
+					float angle = CGeneral::GetRadianAngleBetweenPoints(
+						tmim->GetPosition().x, tmim->GetPosition().y,
+						createdPeds[0]->GetPosition().x, createdPeds[0]->GetPosition().y);
+					tmim->SetHeading(angle);
+					tmim->SetPedState(PED_UNKNOWN);
+				}
+				createdPeds[0]->bIsLeader = true;
+
+				for (int l = 1; l < pedIdx; ++l)
+					createdPeds[l]->SetLeader(createdPeds[0]);
+
+			} else {
+				for (int k = 0; k < pedIdx; ++k) {
+					RemovePed(createdPeds[k]);
+				}
+			}
+		}
+	}
+}
+
+void
+CPopulation::PlaceCouple(ePedType manType, int32 manModel, ePedType womanType, int32 womanModel, CVector coors)
+{
+	// Homosexuality filter!!!! Homophobic R* >>>:(
+	if (manType != PEDTYPE_CIVMALE || womanType != PEDTYPE_CIVFEMALE)
+		return;
+
+	if (!TheCamera.IsSphereVisible(coors, 1.5f) || MIN_CREATION_DIST * PedCreationDistMultiplier() <= (coors - FindPlayerPed()->GetPosition()).Magnitude2D()) {
+		if (CPedPlacement::IsPositionClearForPed(coors, CModelInfo::GetModelInfo(manModel)->GetColModel()->boundingSphere.radius, -1, 0)) {
+			bool manFoundGround;
+			float manGroundZ = CWorld::FindGroundZFor3DCoord(coors.x, coors.y, coors.z, &manFoundGround) + 1.0f;
+			if (manFoundGround) {
+				CVector correctedManPos = coors;
+				correctedManPos.z = Max(coors.z, manGroundZ);
+				if (((CPedModelInfo*)CModelInfo::GetModelInfo(manModel))->GetRwObject()) {
+					CPed *man = AddPed(PEDTYPE_CIVMALE, manModel, correctedManPos);
+					if (man) {
+						man->SetObjective(OBJECTIVE_NONE);
+						man->SetWanderPath(CGeneral::GetRandomNumberInRange(0, 8));
+						man->bIsLeader = true;
+						CVisibilityPlugins::SetClumpAlpha(man->GetClump(), 0);
+
+						if (((CPedModelInfo*)CModelInfo::GetModelInfo(womanModel))->GetRwObject()) {
+							CPed* woman = AddPed(PEDTYPE_CIVFEMALE, womanModel, correctedManPos); // will set the correct position later
+							if (woman) {
+								woman->SetObjective(OBJECTIVE_FOLLOW_CHAR_IN_FORMATION, man);
+								woman->SetFormation(FORMATION_RIGHT);
+
+								CVector formationPos = woman->GetFormationPosition();
+								CVector womanPos = formationPos;
+								bool womanFoundGround;
+								float formationGroundZ = CWorld::FindGroundZFor3DCoord(formationPos.x, formationPos.y, 1.0f + formationPos.z, &womanFoundGround) + 1.0f;
+
+								if (womanFoundGround) {
+									CVector correctedWomanPos = womanPos;
+									correctedWomanPos.z = Max(womanPos.z, formationGroundZ);
+									woman->SetPosition(correctedWomanPos);
+
+									// What's the point of this??
+									CEntity* obstacles[3];
+									memcpy(obstacles, gCoupleObstacles, sizeof(gCoupleObstacles));
+
+									CPedPlacement::IsPositionClearForPed(womanPos, CModelInfo::GetModelInfo(womanModel)->GetColModel()->boundingSphere.radius, ARRAY_SIZE(obstacles), obstacles);
+									for (int i = 0; i < ARRAY_SIZE(obstacles); i++) {
+										CEntity *obstacle = obstacles[i];
+										if (obstacle) {
+
+											// We found a real obstacle, so let's break and we can delete them...
+											if (obstacle != man && obstacle != woman)
+												break;
+										}
+										if (i == ARRAY_SIZE(obstacles) - 1) {
+											CVisibilityPlugins::SetClumpAlpha(woman->GetClump(), 0);
+											return;
+										}
+									}
+								}
+								RemovePed(woman);
+								RemovePed(man);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+// Mostly copy paste of PlaceGangMembersInFormation.
+void
+CPopulation::PlaceMallPedsAsStationaryGroup(CVector const& coors, int32 group)
+{
+#ifdef FIX_BUGS
+	CPed *createdPeds[6];
+#else
+	CPed *createdPeds[5];
+#endif
+
+	if (CGame::currArea != AREA_MALL)
+		return;
+
+	int pedAmount = CGeneral::GetRandomNumberInRange(0, 4) + 3;
+
+	float circleSector = TWOPI / pedAmount;
+
+	float circleR = Sqrt(0.5f / (1.0f - Cos(circleSector)));
+
+	if (!TheCamera.IsSphereVisible(coors, circleR) ||
+		MIN_CREATION_DIST * PedCreationDistMultiplier() <= (coors - FindPlayerPed()->GetPosition()).Magnitude2D()) {
+
+		if (CPedPlacement::IsPositionClearForPed(coors, circleR, -1, 0)) {
+			int pedIdx = 0;
+			CVector leaderPos;
+
+			for (int i = 0; i < pedAmount; i++) {	
+				float angleMult = i + CGeneral::GetRandomNumberInRange(-0.2f, 0.2f);
+				float randomR = circleR + CGeneral::GetRandomNumberInRange(-0.2f, 0.2f) * circleR;
+				float xOffset = randomR * Cos(angleMult * circleSector);
+				float yOffset = randomR * Sin(angleMult * circleSector);
+				bool foundGround;
+				float groundZ = CWorld::FindGroundZFor3DCoord(xOffset + coors.x, yOffset + coors.y, coors.z + 1.0, &foundGround) + 1.0f;
+				if (foundGround) {
+					CVector finalPos(coors.x + xOffset, coors.y + yOffset, coors.z > groundZ ? coors.z : groundZ);
+
+					if (i == 0)
+						leaderPos = finalPos;
+
+					int pedModel = ChooseCivilianOccupation(group);
+					CPedModelInfo *pedModelInfo = (CPedModelInfo*)CModelInfo::GetModelInfo(pedModel);
+					if (pedModelInfo->GetRwObject()) {
+						CEntity* obstacles[6] = { nil, nil, nil, nil, nil, nil };
+						CPedPlacement::IsPositionClearForPed(finalPos, CModelInfo::GetModelInfo(pedModel)->GetColModel()->boundingSphere.radius, ARRAY_SIZE(obstacles), obstacles);
+						bool foundObstacle = false;
+						for (int m = 0; m < ARRAY_SIZE(obstacles); m++) {
+							CEntity* obstacle = obstacles[m];
+							if (obstacle) {
+								int n = 0;
+								bool obstacleIsHarmless = false;
+								for (int n = 0; n < pedIdx; n++) {
+									if (obstacle == createdPeds[n])
+										obstacleIsHarmless = true;
+								}
+								if (!obstacleIsHarmless) {
+									foundObstacle = true;
+									break;
+								}
+							}
+						}
+						bool memberCanSeeLeader = i == 0 ? true : CWorld::GetIsLineOfSightClear(finalPos, leaderPos, true, false, false, false, false, false, false);
+
+						bool notTooCloseToLeader = i == 0 ? true : !(Abs(finalPos.z - leaderPos.z) < 1.0f);
+
+						if (!foundObstacle && memberCanSeeLeader && notTooCloseToLeader) {
+							CPed *newPed = AddPed(pedModelInfo->m_pedType, pedModel, finalPos);
+							if (newPed) {
+								createdPeds[pedIdx++] = newPed;
+								float angle = CGeneral::GetRadianAngleBetweenPoints(
+									coors.x, coors.y,
+									finalPos.x, finalPos.y);
+								newPed->m_fRotationDest = angle;
+								newPed->m_fRotationCur = angle;
+								newPed->m_fearFlags = 0;
+								CVisibilityPlugins::SetClumpAlpha(newPed->GetClump(), 0);
+							}
+							// No.
+#ifndef FIX_BUGS
+							else
+								CWorld::Remove(nil);
+#endif
+						}
+					}
+				}
+			}
+			if (pedIdx >= 3) {
+				for (int j = 0; j < pedIdx / 2; ++j) {
+					createdPeds[j]->SetChat(createdPeds[pedIdx - 1 - j], 100000);
+					createdPeds[pedIdx - 1 - j]->SetChat(createdPeds[j], 100000);
+				}
+
+				// Make that extra guy in the middle stand there(PED_UNKNOWN locks him) and do nothing :lmao:
+				if (pedIdx % 2 != 0) {
+					CPed *tmim = createdPeds[(pedIdx - 1) / 2];
+					float angle = CGeneral::GetRadianAngleBetweenPoints(
+						tmim->GetPosition().x, tmim->GetPosition().y,
+						createdPeds[0]->GetPosition().x, createdPeds[0]->GetPosition().y);
+					tmim->SetHeading(angle);
+					tmim->SetPedState(PED_UNKNOWN);
+				}
+				createdPeds[0]->bIsLeader = true;
+
+				for (int l = 1; l < pedIdx; ++l)
+					createdPeds[l]->SetLeader(createdPeds[0]);
+
+			} else {
+				for (int k = 0; k < pedIdx; ++k) {
+					RemovePed(createdPeds[k]);
+				}
+			}
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/peds/Population.h b/src/peds/Population.h
index 4ea45e7e..8c58f1b6 100644
--- a/src/peds/Population.h
+++ b/src/peds/Population.h
@@ -13,23 +13,6 @@ struct PedGroup
 	int32 models[NUMMODELSPERPEDGROUP];
 };
 
-// Don't know the original name
-struct RegenerationPoint
-{
-	eLevelName srcLevel; // this and below one may need to be exchanged
-	eLevelName destLevel;
-	float x1;
-	float x2;
-	float y1;
-	float y2;
-	float z1;
-	float z2;
-	CVector destPosA;
-	CVector destPosB;
-	CVector srcPosA;
-	CVector srcPosB;
-};
-
 class CPopulation
 {
 public:
@@ -39,6 +22,7 @@ public:
 	static float PedDensityMultiplier;
 	static uint32 ms_nTotalMissionPeds;
 	static int32 MaxNumberOfPedsInUse;
+	static int32 MaxNumberOfPedsInUseInterior;
 	static uint32 ms_nNumCivMale;
 	static uint32 ms_nNumCivFemale;
 	static uint32 ms_nNumCop;
@@ -58,9 +42,6 @@ public:
 	static uint32 ms_nNumGang9;
 	static uint32 ms_nNumGang7;
 	static uint32 ms_nNumGang8;
-	static CVector RegenerationPoint_a;
-	static CVector RegenerationPoint_b;
-	static CVector RegenerationForward;
 
 	static uint32 ms_nTotalCarPassengerPeds;
 	static uint32 NumMiamiViceCops;
@@ -71,13 +52,12 @@ public:
 	static void UpdatePedCount(ePedType, bool);
 	static void DealWithZoneChange(eLevelName oldLevel, eLevelName newLevel, bool);
 	static CPed *AddPedInCar(CVehicle *car, bool isDriver);
-	static bool IsPointInSafeZone(CVector *coors);
 	static void RemovePed(CPed *ent);
 	static int32 ChooseCivilianOccupation(int32);
+	static int32 ChooseNextCivilianOccupation(int32);
+	static void ChooseCivilianCoupleOccupations(int32, int32&, int32&);
 	static int32 ChoosePolicePedOccupation();
 	static int32 ChooseGangOccupation(int);
-	static void FindCollisionZoneForCoors(CVector*, int*, eLevelName*);
-	static void FindClosestZoneForCoors(CVector*, int*, eLevelName, eLevelName);
 	static void GeneratePedsAtStartOfGame();
 	static float PedCreationDistMultiplier();
 	static CPed *AddPed(ePedType pedType, uint32 mi, CVector const &coors, int32 modifier = 0);
@@ -91,6 +71,18 @@ public:
 	static bool TestSafeForRealObject(CDummyObject*);
 	static bool IsSkateable(CVector const&);
 	static bool CanJeerAtStripper(int32 model);
-
+	static void RemovePedsIfThePoolGetsFull(void);
+	static bool IsMale(int32);
+	static bool IsFemale(int32);
+	static bool IsSunbather(int32);
+	static int32 ComputeRandomisedGangSize(void);
+	static bool CanSolicitPlayerInCar(int32);
+	static bool CanSolicitPlayerOnFoot(int32);
+	static bool IsSecurityGuard(ePedType);
+	static void PlaceGangMembers(ePedType, int32, CVector const&);
+	static void PlaceGangMembersInFormation(ePedType, int32, CVector const&);
+	static void PlaceGangMembersInCircle(ePedType, int32, CVector const&);
+	static void PlaceCouple(ePedType, int32, ePedType, int32, CVector);
+	static void PlaceMallPedsAsStationaryGroup(CVector const&, int32);
 	static CPed* AddDeadPedInFrontOfCar(const CVector& pos, CVehicle* pCulprit);
 };
diff --git a/src/render/Credits.cpp b/src/render/Credits.cpp
index 4f02eca4..75342bad 100644
--- a/src/render/Credits.cpp
+++ b/src/render/Credits.cpp
@@ -14,14 +14,6 @@
 bool CCredits::bCreditsGoing;
 uint32 CCredits::CreditsStartTime;
 
-#ifdef ASPECT_RATIO_SCALE
-#define SCALE_AND_CENTER(x) ScaleAndCenterX(x)
-extern float ScaleAndCenterX(float x);
-#else
-#define SCALE_AND_CENTER(x) SCREEN_STRETCH_X(x)
-#endif
-
-
 void
 CCredits::Init(void)
 {
@@ -81,7 +73,7 @@ CCredits::Render(void)
 	scrolloffset = (CTimer::GetTimeInMilliseconds() - CreditsStartTime) / 24.0f;
 	CFont::SetJustifyOff();
 	CFont::SetBackgroundOff();
-	CFont::SetCentreSize(SCALE_AND_CENTER(DEFAULT_SCREEN_WIDTH * 0.75f));
+	CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.75f));
 	CFont::SetCentreOn();
 	CFont::SetPropOn();
 	CFont::SetFontStyle(FONT_STANDARD);
@@ -429,7 +421,7 @@ CCredits::Render(void)
     PrintCreditText(0.65f, 0.65f, TheText.Get("CRED129"), lineoffset, scrolloffset);
     PrintCreditSpace(1.5f, lineoffset);
 
-    CFont::SetCentreSize(SCALE_AND_CENTER(DEFAULT_SCREEN_WIDTH * 0.8f));
+    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.8f));
 
     PrintCreditText(1.1f, 0.8f, TheText.Get("CRD111A"), lineoffset, scrolloffset);
     PrintCreditSpace(0.5f, lineoffset);
@@ -477,7 +469,7 @@ CCredits::Render(void)
         PrintCreditSpace(0.5f, lineoffset);
     PrintCreditText(0.65f, 0.65f, TheText.Get("CRD134I"), lineoffset, scrolloffset);
 
-    CFont::SetCentreSize(SCALE_AND_CENTER(DEFAULT_SCREEN_WIDTH * 0.7f));
+    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.7f));
 
     PrintCreditSpace(1.5f, lineoffset);
     PrintCreditText(1.1f, 0.8f, TheText.Get("CRED135"), lineoffset, scrolloffset);
@@ -513,7 +505,7 @@ CCredits::Render(void)
     PrintCreditText(1.1f, 1.1f, TheText.Get("CRD140L"), lineoffset, scrolloffset);
     PrintCreditSpace(1.5f, lineoffset);
     
-    CFont::SetCentreSize(SCALE_AND_CENTER(DEFAULT_SCREEN_WIDTH * 0.85f));
+    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.85f));
 
     PrintCreditText(0.95f, 0.7f, TheText.Get("CRED259"), lineoffset, scrolloffset);
     PrintCreditSpace(0.5f, lineoffset);
@@ -594,7 +586,7 @@ CCredits::Render(void)
     PrintCreditText(0.65f, 0.65f, TheText.Get("CRED172"), lineoffset, scrolloffset);
     PrintCreditSpace(0.5f, lineoffset);
 
-    CFont::SetCentreSize(SCALE_AND_CENTER(DEFAULT_SCREEN_WIDTH * 0.75f));
+    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.75f));
 
     PrintCreditSpace(1.5f, lineoffset);
     PrintCreditText(0.95f, 0.7f, TheText.Get("CRED217"), lineoffset, scrolloffset);
@@ -717,7 +709,7 @@ CCredits::Render(void)
     PrintCreditText(0.65f, 0.65f, TheText.Get("CRED332"), lineoffset, scrolloffset);
     PrintCreditSpace(1.5f, lineoffset);
     
-    CFont::SetCentreSize(SCALE_AND_CENTER(DEFAULT_SCREEN_WIDTH * 0.8f));
+    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.8f));
 
     PrintCreditText(0.95f, 0.7f, TheText.Get("CRED333"), lineoffset, scrolloffset);
     PrintCreditSpace(0.5f, lineoffset);
@@ -755,7 +747,7 @@ CCredits::Render(void)
 
     PrintCreditSpace(1.5f, lineoffset);
 
-    CFont::SetCentreSize(SCALE_AND_CENTER(DEFAULT_SCREEN_WIDTH * 0.75f));
+    CFont::SetCentreSize(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH * 0.75f));
 
     PrintCreditText(0.95f, 0.7f, TheText.Get("CRED267"), lineoffset, scrolloffset);
     PrintCreditSpace(0.5f, lineoffset);
@@ -818,6 +810,4 @@ CCredits::Render(void)
 bool CCredits::AreCreditsDone(void)
 {
 	return !bCreditsGoing;
-}
-
-#undef SCALE_AND_CENTER
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/render/Draw.cpp b/src/render/Draw.cpp
index ab360aac..131534a3 100644
--- a/src/render/Draw.cpp
+++ b/src/render/Draw.cpp
@@ -69,3 +69,14 @@ CDraw::SetFOV(float fov)
 #endif
 	ms_fFOV = fov;
 }
+
+#ifdef ASPECT_RATIO_SCALE
+float
+ScaleAndCenterX(float x)
+{
+	if (SCREEN_WIDTH == DEFAULT_SCREEN_WIDTH)
+		return x;
+	else
+		return (SCREEN_WIDTH - SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH)) / 2 + SCREEN_SCALE_X(x);
+}
+#endif 
\ No newline at end of file
diff --git a/src/render/Font.cpp b/src/render/Font.cpp
index 1e60083b..c0cc333a 100644
--- a/src/render/Font.cpp
+++ b/src/render/Font.cpp
@@ -228,8 +228,8 @@ CFont::Initialise(void)
 	SetColor(CRGBA(0xFF, 0xFF, 0xFF, 0));
 	SetJustifyOff();
 	SetCentreOff();
-	SetWrapx(DEFAULT_SCREEN_WIDTH);
-	SetCentreSize(DEFAULT_SCREEN_WIDTH);
+	SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
+	SetCentreSize(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
 	SetBackgroundOff();
 	SetBackgroundColor(CRGBA(0x80, 0x80, 0x80, 0x80));
 	SetBackGroundOnlyTextOff();
@@ -996,22 +996,10 @@ CFont::GetStringWidth(wchar *s, bool spaces)
 	{
 		for (wchar c = *s; (c != ' ' || spaces) && c != '\0'; c = *(++s)) {
 			if (c == '~') {
-
-				// This is original code
-#if 0
 				s++;
 				while (*s != '~') {
 					s++;
 				}
-#else
-				// TODO(Miami): This is my code to prevent fuck up until InsertPlayerControlKeysInString is done 
-				if (*(s + 1) != '~') {
-					s++;
-					while (*s != '~') {
-						s++;
-					}
-				}
-#endif
 			}
 			else {
 				w += GetCharacterSize(c - ' ');
diff --git a/src/render/Hud.cpp b/src/render/Hud.cpp
index c05a3d31..36815ab5 100644
--- a/src/render/Hud.cpp
+++ b/src/render/Hud.cpp
@@ -405,7 +405,7 @@ void CHud::Draw()
 		CFont::SetScale(SCREEN_SCALE_X(0.5f), SCREEN_SCALE_Y(0.8f));
 		CFont::SetJustifyOff();
 		CFont::SetCentreOn();
-		CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH));
+		CFont::SetCentreSize(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
 		CFont::SetPropOn();
 		CFont::SetDropShadowPosition(0);
 		CFont::SetFontStyle(FONT_STANDARD);
@@ -886,7 +886,7 @@ void CHud::Draw()
 						CFont::SetRightJustifyWrap(0.0f);
 						CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
 						CFont::SetColor(CRGBA(244, 20, 20, 255));
-						CFont::SetWrapx(SCREEN_SCALE_X(640.0f));
+						CFont::SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH));
 						CFont::SetPropOff();
 						CFont::SetBackGroundOnlyTextOn();
 
@@ -1024,8 +1024,8 @@ void CHud::Draw()
 				else
 					CFont::SetCentreOff();
 
-				CFont::SetWrapx(SCREEN_SCALE_X(CTheScripts::IntroTextLines[i].m_fWrapX));
-				CFont::SetCentreSize(SCREEN_SCALE_X(CTheScripts::IntroTextLines[i].m_fCenterSize));
+				CFont::SetWrapx(SCALE_AND_CENTER_X(CTheScripts::IntroTextLines[i].m_fWrapX));
+				CFont::SetCentreSize(SCALE_AND_CENTER_X(CTheScripts::IntroTextLines[i].m_fCenterSize));
 
 				if (CTheScripts::IntroTextLines[i].m_bBackground)
 					CFont::SetBackgroundOn();
@@ -1045,7 +1045,7 @@ void CHud::Draw()
 					CFont::SetPropOff();
 
 				CFont::SetFontStyle(FONT_LOCALE(CTheScripts::IntroTextLines[i].m_nFont));
-				CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - CTheScripts::IntroTextLines[i].m_fAtX), SCREEN_SCALE_Y(DEFAULT_SCREEN_HEIGHT - CTheScripts::IntroTextLines[i].m_fAtY), CTheScripts::IntroTextLines[i].m_Text);
+				CFont::PrintString(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH - CTheScripts::IntroTextLines[i].m_fAtX), SCREEN_SCALE_Y(DEFAULT_SCREEN_HEIGHT - CTheScripts::IntroTextLines[i].m_fAtY), CTheScripts::IntroTextLines[i].m_Text);
 			}
 		}
 		for (int i = 0; i < ARRAY_SIZE(CTheScripts::IntroRectangles); i++) {
@@ -1250,10 +1250,12 @@ void CHud::Draw()
 				}
 				CFont::SetPropOn();
 				CFont::SetCentreOn();
-				CFont::SetCentreSize(SCREEN_SCALE_X(590.0f));
+				CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(50.0f));
 				CFont::SetColor(CRGBA(255, 255, 0, BigMessageAlpha[0])); // unused color
 				CFont::SetFontStyle(FONT_HEADING);
 
+				// Appearently sliding text in here was abandoned very early, since this text is centered now.
+
 				if (BigMessageX[0] >= SCREEN_SCALE_FROM_RIGHT(20.0f)) {
 					BigMessageInUse[0] += CTimer::GetTimeStep();
 
@@ -1268,7 +1270,7 @@ void CHud::Draw()
 					}
 				}
 				else {
-					BigMessageX[0] += (CTimer::GetTimeStepInMilliseconds() * 0.3f);
+					BigMessageX[0] += SCREEN_SCALE_X((CTimer::GetTimeStepInMilliseconds() * 0.3f));
 					BigMessageAlpha[0] += (CTimer::GetTimeStepInMilliseconds() * 0.3f);
 
 					if (BigMessageAlpha[0] > 255.0f)
@@ -1282,7 +1284,7 @@ void CHud::Draw()
 			}
 			else {
 				BigMessageAlpha[0] = 0.0f;
-				BigMessageX[0] = -60.0f;
+				BigMessageX[0] = SCREEN_SCALE_FROM_RIGHT(DEFAULT_SCREEN_WIDTH + 60.0f);
 				BigMessageInUse[0] = 1.0f;
 			}
 		}
@@ -1293,7 +1295,7 @@ void CHud::Draw()
 		// WastedBustedText
 		if (m_BigMessage[2][0]) {
 			if (BigMessageInUse[2] != 0.0f) {
-				BigMessageAlpha[2] += (CTimer::GetTimeStepInSeconds() * 255.0f);
+				BigMessageAlpha[2] += (CTimer::GetTimeStepInMilliseconds() * 0.4f);
 
 				if (BigMessageAlpha[2] > 255.0f)
 					BigMessageAlpha[2] = 255.0f;
@@ -1330,6 +1332,7 @@ void CHud::Draw()
 	}
 }
 
+// --MIAMI: Done
 void CHud::DrawAfterFade()
 {
 	RwRenderStateSet(rwRENDERSTATETEXTUREFILTER, (void*)rwFILTERNEAREST);
@@ -1360,8 +1363,8 @@ void CHud::DrawAfterFade()
 			else
 				CFont::SetCentreOff();
 
-			CFont::SetWrapx(SCREEN_SCALE_X(line.m_fWrapX));
-			CFont::SetCentreSize(SCREEN_SCALE_X(line.m_fCenterSize));
+			CFont::SetWrapx(SCALE_AND_CENTER_X(line.m_fWrapX));
+			CFont::SetCentreSize(SCALE_AND_CENTER_X(line.m_fCenterSize));
 			if (line.m_bBackground)
 				CFont::SetBackgroundOn();
 			else
@@ -1379,7 +1382,7 @@ void CHud::DrawAfterFade()
 				CFont::SetPropOff();
 
 			CFont::SetFontStyle(line.m_nFont);
-			CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - line.m_fAtX), SCREEN_SCALE_Y(DEFAULT_SCREEN_HEIGHT - line.m_fAtY), line.m_Text);
+			CFont::PrintString(SCALE_AND_CENTER_X(DEFAULT_SCREEN_WIDTH - line.m_fAtX), SCREEN_SCALE_Y(DEFAULT_SCREEN_HEIGHT - line.m_fAtY), line.m_Text);
 		}
 	}
 	for (int i = 0; i < ARRAY_SIZE(CTheScripts::IntroRectangles); i++) {
@@ -1407,7 +1410,7 @@ void CHud::DrawAfterFade()
 		CFont::SetScale(SCREEN_SCALE_X(1.2f), SCREEN_SCALE_Y(1.5f));
 		CFont::SetCentreOn();
 		CFont::SetPropOn();
-		CFont::SetCentreSize(SCREEN_SCALE_X(600.0f));
+		CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(40.0f));
 		CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
 		CFont::SetDropShadowPosition(2);
 		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
@@ -1421,7 +1424,7 @@ void CHud::DrawAfterFade()
 		CFont::SetScale(SCREEN_SCALE_X(1.2f), SCREEN_SCALE_Y(1.5f));
 		CFont::SetCentreOn();
 		CFont::SetPropOn();
-		CFont::SetCentreSize(SCREEN_SCALE_X(620.0f));
+		CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(60.0f));
 		CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
 		CFont::SetDropShadowPosition(2);
 		CFont::SetDropColor(CRGBA(0, 0, 0, 255));
@@ -1451,7 +1454,7 @@ void CHud::DrawAfterFade()
 				}
 				break;
 			case 2:
-				OddJob2Timer += (20.0f * CTimer::GetTimeStep());
+				OddJob2Timer += CTimer::GetTimeStepInMilliseconds();
 				if (OddJob2Timer > 1500) {
 					OddJob2On = 3;
 				}
@@ -1476,20 +1479,18 @@ void CHud::DrawAfterFade()
 			CFont::SetScale(SCREEN_SCALE_X(1.0f), SCREEN_SCALE_Y(1.2f));
 			CFont::SetCentreOn();
 			CFont::SetPropOn();
-			CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(20.0f));
-			CFont::SetColor(CRGBA(0, 0, 0, 255));
+			CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(80.0f));
 			CFont::SetFontStyle(FONT_LOCALE(FONT_STANDARD));
-
+			CFont::SetDropShadowPosition(2);
+			CFont::SetDropColor(CRGBA(0, 0, 0, 255));
 #ifdef BETA_SLIDING_TEXT
-			CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f) - SCREEN_SCALE_X(OddJob2XOffset), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[5]);
 
 			CFont::SetColor(ODDJOB2_COLOR);
-			CFont::PrintString(SCREEN_WIDTH / 2 - SCREEN_SCALE_X(OddJob2XOffset), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f), m_BigMessage[5]);
+			CFont::PrintString(SCREEN_WIDTH / 2 - SCREEN_SCALE_X(OddJob2XOffset), SCREEN_SCALE_Y(217.0f), m_BigMessage[5]);
 #else
-			CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[5]);
 
 			CFont::SetColor(ODDJOB2_COLOR);
-			CFont::PrintString(SCREEN_WIDTH / 2, SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f), m_BigMessage[5]);
+			CFont::PrintString(SCREEN_WIDTH / 2, SCREEN_SCALE_Y(217.0f), m_BigMessage[5]);
 #endif
 		}
 	}
@@ -1502,6 +1503,7 @@ void CHud::DrawAfterFade()
 			CFont::SetJustifyOff();
 			CFont::SetBackgroundOff();
 
+			// will be overwritten below
 			if (CGame::frenchGame || FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_SPANISH)
 				CFont::SetScale(SCREEN_SCALE_X(0.884f), SCREEN_SCALE_Y(1.36f));
 			else
@@ -1511,41 +1513,45 @@ void CHud::DrawAfterFade()
 			CFont::SetRightJustifyWrap(0.0f);
 			CFont::SetRightJustifyOn();
 			CFont::SetFontStyle(FONT_BANK);
+			CFont::SetScale(FrontEndMenuManager.m_PrefsLanguage == CMenuManager::LANGUAGE_AMERICAN ? SCREEN_SCALE_X(1.7f) : SCREEN_SCALE_X(1.5f), SCREEN_SCALE_Y(1.8f));
+
 			if (BigMessageX[1] >= SCREEN_SCALE_FROM_RIGHT(20.0f)) {
 				BigMessageInUse[1] += CTimer::GetTimeStep();
 
 				if (BigMessageInUse[1] >= 120.0f) {
 					BigMessageInUse[1] = 120.0f;
-					BigMessageAlpha[1] -= (CTimer::GetTimeStepInMilliseconds() * 0.3f);
+					BigMessageAlpha[1] -= CTimer::GetTimeStepInMilliseconds();
 				}
 				if (BigMessageAlpha[1] <= 0) {
 					m_BigMessage[1][0] = 0;
+					BigMessageInUse[1] = 0.0f;
 					BigMessageAlpha[1] = 0.0f;
 				}
 			} else {
-				BigMessageX[1] += (CTimer::GetTimeStepInMilliseconds() * 0.3f);
-				BigMessageAlpha[1] += (CTimer::GetTimeStepInMilliseconds() * 0.3f);
+				BigMessageX[1] += SCREEN_SCALE_X((CTimer::GetTimeStepInMilliseconds() * 0.3f));
+				BigMessageAlpha[1] += CTimer::GetTimeStepInMilliseconds();
 
 				if (BigMessageAlpha[1] > 255.0f)
 					BigMessageAlpha[1] = 255.0f;
 			}
 
-			CFont::SetDropShadowPosition(2);
-			CFont::SetDropColor(CRGBA(40, 40, 40, BigMessageAlpha[1]));
-			//CFont::SetColor(CRGBA(40, 40, 40, BigMessageAlpha[1]));
-			//CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f) + SCREEN_SCALE_X(2.0f), SCREEN_SCALE_FROM_BOTTOM(120.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[1]);
+			CFont::SetColor(CRGBA(40, 40, 40, BigMessageAlpha[1])); // what was that for?
 
+			CFont::SetDropShadowPosition(2);
+			CFont::SetDropColor(CRGBA(0, 0, 0, BigMessageAlpha[1]));
 			CFont::SetColor(CRGBA(MISSIONTITLE_COLOR.r, MISSIONTITLE_COLOR.g, MISSIONTITLE_COLOR.b, BigMessageAlpha[1]));
-			CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(120.0f), m_BigMessage[1]);
-		}
-		else {
-			BigMessageAlpha[1] = 0.0f;
-			BigMessageX[1] = -60.0f;
+#ifdef BETA_SLIDING_TEXT
+			CFont::PrintString(BigMessageX[1], SCREEN_SCALE_FROM_BOTTOM(140.0f), m_BigMessage[1]);
+#else
+			CFont::PrintString(SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(140.0f), m_BigMessage[1]);
+#endif
+		} else {
+			m_ZoneFadeTimer = 0;
+			BigMessageX[1] = SCREEN_SCALE_FROM_RIGHT(DEFAULT_SCREEN_WIDTH + 60.0f);
 			BigMessageInUse[1] = 1.0f;
 			m_ZoneState = 0;
 		}
-	}
-	else {
+	} else {
 		BigMessageInUse[1] = 0.0f;
 	}
 }
@@ -1925,3 +1931,12 @@ float CHud::DrawFadeState(DRAW_FADE_STATE fadingElement, int forceFadingIn)
 
 	return clamp(alpha, 0.0f, 255.0f);
 }
+
+void
+CHud::ResetWastedText(void)
+{
+	BigMessageInUse[2] = 0.0f;
+	BigMessageInUse[0] = 0.0f;
+	m_BigMessage[2][0] = 0;
+	m_BigMessage[0][0] = 0;
+}
\ No newline at end of file
diff --git a/src/render/Hud.h b/src/render/Hud.h
index 4dd52aa8..f4c0d8c4 100644
--- a/src/render/Hud.h
+++ b/src/render/Hud.h
@@ -140,4 +140,5 @@ public:
 	static void SetZoneName(wchar *name);
 	static void Shutdown();
 	static float DrawFadeState(DRAW_FADE_STATE, int);
+	static void ResetWastedText(void);
 };
diff --git a/src/save/PCSave.cpp b/src/save/PCSave.cpp
index 8514a2b6..6449d586 100644
--- a/src/save/PCSave.cpp
+++ b/src/save/PCSave.cpp
@@ -11,6 +11,8 @@
 #include "PCSave.h"
 #include "Text.h"
 
+// --MIAMI: file done
+
 const char* _psGetUserFilesFolder();
 
 C_PcSave PcSaveHelper;
@@ -18,7 +20,7 @@ C_PcSave PcSaveHelper;
 void
 C_PcSave::SetSaveDirectory(const char *path)
 {
-	sprintf(DefaultPCSaveFileName, "%s\\%s", path, "GTA3sf");
+	sprintf(DefaultPCSaveFileName, "%s\\%s", path, "GTAVCsf");
 }
 
 bool
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index 26208ebf..b40130c4 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -1736,7 +1736,6 @@ main(int argc, char *argv[])
 #else				
 						LoadingScreen(nil, nil, "loadsc0");
 #endif
-						
 						if ( !CGame::InitialiseOnceAfterRW() )
 							RsGlobal.quit = TRUE;
 						
@@ -1748,7 +1747,7 @@ main(int argc, char *argv[])
 #endif
 						break;
 					}
-					
+#ifndef PS2_MENU
 					case GS_INIT_FRONTEND:
 					{
 						LoadingScreen(nil, nil, "loadsc0");
@@ -1769,7 +1768,6 @@ main(int argc, char *argv[])
 						break;
 					}
 					
-#ifndef PS2_MENU
 					case GS_FRONTEND:
 					{
 						if(!glfwGetWindowAttrib(PSGLOBAL(window), GLFW_ICONIFIED))
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index cc106e39..d8e54d80 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -2508,9 +2508,11 @@ WinMain(HINSTANCE instance,
 		{
 			if ( gGameState == GS_PLAYING_GAME )
 				CGame::ShutDown();
+#ifndef MASTER
 			else if ( gGameState == GS_ANIMVIEWER )
 				CAnimViewer::Shutdown();
-			
+#endif
+
 			CTimer::Stop();
 			
 			if ( FrontEndMenuManager.m_bFirstTime == true )
@@ -2533,8 +2535,10 @@ WinMain(HINSTANCE instance,
 
 	if ( gGameState == GS_PLAYING_GAME )
 		CGame::ShutDown();
+#ifndef MASTER
 	else if ( gGameState == GS_ANIMVIEWER )
 		CAnimViewer::Shutdown();
+#endif
 
 	DMAudio.Terminate();
 	
diff --git a/src/vehicles/CarGen.cpp b/src/vehicles/CarGen.cpp
index 84a19b82..855d00b1 100644
--- a/src/vehicles/CarGen.cpp
+++ b/src/vehicles/CarGen.cpp
@@ -18,6 +18,8 @@
 #include "Zones.h"
 #include "Occlusion.h"
 
+// --MIAMI: file done
+
 uint8 CTheCarGenerators::ProcessCounter;
 uint32 CTheCarGenerators::NumOfCarGenerators;
 CCarGenerator CTheCarGenerators::CarGeneratorArray[NUM_CARGENS];
@@ -42,7 +44,6 @@ uint32 CCarGenerator::CalcNextGen()
 	return CTimer::GetTimeInMilliseconds() + 4;
 }
 
-//TODO(MIAMI): check for more changes - so far only -1 mi is accounted for
 void CCarGenerator::DoInternalProcessing()
 {
 	int mi;
@@ -53,6 +54,7 @@ void CCarGenerator::DoInternalProcessing()
 			m_nTimer += 4;
 			return;
 		}
+		CStreaming::RequestModel(m_nModelIndex, STREAMFLAGS_DEPENDENCY);
 		mi = m_nModelIndex;
 	}
 	else {
@@ -73,29 +75,25 @@ void CCarGenerator::DoInternalProcessing()
 			return;
 		}
 	}
-	CStreaming::RequestModel(mi, STREAMFLAGS_DEPENDENCY);
 	if (!CStreaming::HasModelLoaded(mi))
 		return;
 	CVehicle* pVehicle;
+
+	CVector pos;
 	if (CModelInfo::IsBoatModel(mi)){
 		CBoat* pBoat = new CBoat(mi, PARKED_VEHICLE);
+		pos = m_vecPos;
 		pVehicle = pBoat;
-		pBoat->bIsStatic = false;
-		pBoat->bEngineOn = false;
-		CVector pos = m_vecPos;
 		if (pos.z <= -100.0f)
 			pos.z = CWorld::FindGroundZForCoord(pos.x, pos.y);
-		pos.z += pBoat->GetDistanceFromCentreOfMassToBaseOfModel();
-		pBoat->SetPosition(pos);
-		pBoat->SetOrientation(0.0f, 0.0f, DEGTORAD(m_fAngle));
-		pBoat->SetStatus(STATUS_ABANDONED);
-		pBoat->m_nDoorLock = CARLOCK_UNLOCKED;
+		pBoat->bExtendedRange = false;
 	}else{
-		bool groundFound = false;
-		CVector pos = m_vecPos;
+		bool groundFound;
+		pos = m_vecPos;
 		if (pos.z > -100.0f){
 			pos.z = CWorld::FindGroundZFor3DCoord(pos.x, pos.y, pos.z, &groundFound);
 		}else{
+			groundFound = false;
 			CColPoint cp;
 			CEntity* pEntity;
 			groundFound = CWorld::ProcessVerticalLine(CVector(pos.x, pos.y, 1000.0f), -1000.0f,
@@ -107,7 +105,7 @@ void CCarGenerator::DoInternalProcessing()
 			debug("CCarGenerator::DoInternalProcessing - can't find ground z for new car x = %f y = %f \n", m_vecPos.x, m_vecPos.y);
 			return;
 		}
-		if (CModelInfo::IsBikeModel(mi)) {
+		if (CModelInfo::GetModelInfo(mi)->GetModelType() == VEHICLE_TYPE_BIKE) {
 			CBike* pBike = new CBike(mi, PARKED_VEHICLE);
 			pBike->bIsStanding = true;
 			pVehicle = pBike;
@@ -116,16 +114,16 @@ void CCarGenerator::DoInternalProcessing()
 			CAutomobile* pCar = new CAutomobile(mi, PARKED_VEHICLE);
 			pVehicle = pCar;
 		}
-		pVehicle->bIsStatic = false;
-		pVehicle->bEngineOn = false;
-		pos.z += pVehicle->GetDistanceFromCentreOfMassToBaseOfModel();
-		pVehicle->SetPosition(pos);
-		pVehicle->SetOrientation(0.0f, 0.0f, DEGTORAD(m_fAngle));
-		pVehicle->SetStatus(STATUS_ABANDONED);
+		// pVehicle->GetDistanceFromCentreOfMassToBaseOfModel();
 		pVehicle->bLightsOn = false;
-		pVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
-
 	}
+	pVehicle->bIsStatic = false;
+	pVehicle->bEngineOn = false;
+	pos.z += pVehicle->GetDistanceFromCentreOfMassToBaseOfModel();
+	pVehicle->SetPosition(pos);
+	pVehicle->SetOrientation(0.0f, 0.0f, DEGTORAD(m_fAngle));
+	pVehicle->SetStatus(STATUS_ABANDONED);
+	pVehicle->m_nDoorLock = CARLOCK_UNLOCKED;
 	CWorld::Add(pVehicle);
 	if (CGeneral::GetRandomNumberInRange(0, 100) < m_nAlarm)
 		pVehicle->m_nAlarmState = -1;
@@ -173,6 +171,8 @@ void CCarGenerator::Process()
 	m_nVehicleHandle = -1;
 	m_bIsBlocking = true;
 	pVehicle->bExtendedRange = false;
+	if (m_nModelIndex < 0)
+		m_nModelIndex = -1;
 }
 
 void CCarGenerator::Setup(float x, float y, float z, float angle, int32 mi, int16 color1, int16 color2, uint8 force, uint8 alarm, uint8 lock, uint16 min_delay, uint16 max_delay)
@@ -217,8 +217,8 @@ bool CCarGenerator::CheckIfWithinRangeOfAnyPlayers()
 	float farclip = 110.0f * TheCamera.GenerationDistMultiplier;
 	float nearclip = farclip - 20.0f;
 	bool canBeRemoved = (m_nModelIndex > 0 && CModelInfo::IsBoatModel(m_nModelIndex) && 165.0f * TheCamera.GenerationDistMultiplier > distance &&
-		TheCamera.IsSphereVisible(m_vecPos, 0.0f) && COcclusion::IsPositionOccluded(m_vecPos, 0.0f)); 
-	if (distance >= farclip || canBeRemoved){
+		TheCamera.IsSphereVisible(m_vecPos, 0.0f) && !COcclusion::IsPositionOccluded(m_vecPos, 0.0f)); 
+	if (distance >= farclip && !canBeRemoved){
 		if (m_bIsBlocking)
 			m_bIsBlocking = false;
 		return false;
@@ -227,7 +227,7 @@ bool CCarGenerator::CheckIfWithinRangeOfAnyPlayers()
 		return true;
 	if (m_bIsBlocking)
 		return false;
-	if (distance < nearclip)
+	if (distance < nearclip && !m_bForceSpawn)
 		return false;
 	return DotProduct2D(direction, FindPlayerSpeed()) <= 0;
 }
@@ -246,8 +246,9 @@ void CTheCarGenerators::Process()
 
 int32 CTheCarGenerators::CreateCarGenerator(float x, float y, float z, float angle, int32 mi, int16 color1, int16 color2, uint8 force, uint8 alarm, uint8 lock, uint16 min_delay, uint16 max_delay)
 {
-	CarGeneratorArray[NumOfCarGenerators].Setup(x, y, z, angle, mi, color1, color2, force, alarm, lock, min_delay, max_delay);
-	return NumOfCarGenerators++;
+	if (NumOfCarGenerators < NUM_CARGENS)
+		CarGeneratorArray[NumOfCarGenerators++].Setup(x, y, z, angle, mi, color1, color2, force, alarm, lock, min_delay, max_delay);
+	return NumOfCarGenerators - 1;
 }
 
 void CTheCarGenerators::Init()
@@ -279,6 +280,11 @@ VALIDATESAVEBUF(*size)
 
 void CTheCarGenerators::LoadAllCarGenerators(uint8* buffer, uint32 size)
 {
+	NumOfCarGenerators = 0;
+	GenerateEvenIfPlayerIsCloseCounter = 0;
+	CurrentActiveCount = 0;
+	ProcessCounter = 0;
+
 	const int32 nGeneralDataSize = sizeof(NumOfCarGenerators) + sizeof(CurrentActiveCount) + sizeof(ProcessCounter) + sizeof(GenerateEvenIfPlayerIsCloseCounter) + sizeof(int16);
 	Init();
 INITSAVEBUF
diff --git a/src/vehicles/Cranes.cpp b/src/vehicles/Cranes.cpp
index 83c727f5..1ab31574 100644
--- a/src/vehicles/Cranes.cpp
+++ b/src/vehicles/Cranes.cpp
@@ -52,17 +52,22 @@ void CCranes::InitCranes(void)
 				CEntity* pEntity = (CEntity*)pNode->item;
 				if (MODELID_CRANE_1 == pEntity->GetModelIndex() ||
 					MODELID_CRANE_2 == pEntity->GetModelIndex() ||
-					MODELID_CRANE_3 == pEntity->GetModelIndex())
+					MODELID_CRANE_3 == pEntity->GetModelIndex() ||
+					MODELID_CRANE_4 == pEntity->GetModelIndex() ||
+					MODELID_CRANE_5 == pEntity->GetModelIndex() ||
+					MODELID_CRANE_6 == pEntity->GetModelIndex())
 					AddThisOneCrane(pEntity);
 			}
 		}
 	}
-	// TODO(MIAMI): LEVEL_MAINLAND just so it compiles
 	for (CPtrNode* pNode = CWorld::GetBigBuildingList(LEVEL_MAINLAND).first; pNode; pNode = pNode->next) {
 		CEntity* pEntity = (CEntity*)pNode->item;
 		if (MODELID_CRANE_1 == pEntity->GetModelIndex() ||
 			MODELID_CRANE_2 == pEntity->GetModelIndex() ||
-			MODELID_CRANE_3 == pEntity->GetModelIndex())
+			MODELID_CRANE_3 == pEntity->GetModelIndex() ||
+			MODELID_CRANE_4 == pEntity->GetModelIndex() ||
+			MODELID_CRANE_5 == pEntity->GetModelIndex() ||
+			MODELID_CRANE_6 == pEntity->GetModelIndex())
 			AddThisOneCrane(pEntity);
 	}
 }
@@ -85,21 +90,7 @@ void CCranes::AddThisOneCrane(CEntity* pEntity)
 	pCrane->m_nCraneState = CCrane::IDLE;
 	pCrane->m_bWasMilitaryCrane = false;
 	pCrane->m_bIsTop = (MODELID_CRANE_1 != pEntity->GetModelIndex());
-#if 0
-	// Is this used to avoid military crane?
-	if (pCrane->m_bIsTop || pEntity->GetPosition().y > 0.0f) {
-		CObject* pHook = new CObject(MI_MAGNET, false);
-		pHook->ObjectCreatedBy = MISSION_OBJECT;
-		pHook->bUsesCollision = false;
-		pHook->bExplosionProof = true;
-		pHook->bAffectedByGravity = false;
-		pCrane->m_pHook = pHook;
-		pCrane->CalcHookCoordinates(&pCrane->m_vecHookCurPos.x, &pCrane->m_vecHookCurPos.y, &pCrane->m_vecHookCurPos.z);
-		pCrane->SetHookMatrix();
-	}
-	else
-#endif
-		pCrane->m_pHook = nil;
+	pCrane->m_pHook = nil;
 	NumCranes++;
 }
 
diff --git a/src/weapons/ShotInfo.cpp b/src/weapons/ShotInfo.cpp
index a70f3f7b..ae7b9d2d 100644
--- a/src/weapons/ShotInfo.cpp
+++ b/src/weapons/ShotInfo.cpp
@@ -10,6 +10,8 @@
 #include "Ped.h"
 #include "Fire.h"
 
+// --MIAMI: file done
+
 CShotInfo gaShotInfo[NUMSHOTINFOS];
 float CShotInfo::ms_afRandTable[20];