15 files changed, 8 insertions, 365 deletions

diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index 079024f6..f3511366 100644
--- a/src/peds/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
@@ -18,8 +18,6 @@
 #include <float.h>
 #endif
 
-// --MIAMI: file done
-
 CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype)
 {
 	SetModelIndex(mi);
@@ -420,7 +418,6 @@ CCivilianPed::ProcessControl(void)
 		Avoid();
 }
 
-// --MIAMI: Done
 bool
 CPed::RunToReportCrime(eCrimeType crimeToReport)
 {
diff --git a/src/peds/CopPed.cpp b/src/peds/CopPed.cpp
index 762c7f1a..9d22c98c 100644
--- a/src/peds/CopPed.cpp
+++ b/src/peds/CopPed.cpp
@@ -20,8 +20,6 @@
 #include "Ropes.h"
 #include "Stinger.h"
 
-// --MIAMI: file done except TODOs
-
 CCopPed::CCopPed(eCopType copType, int32 modifier) : CPed(PEDTYPE_COP)
 {
 	m_nCopType = copType;
@@ -196,7 +194,7 @@ CCopPed::ClearPursuit(void)
 	m_bZoneDisabled = false;
 	ClearObjective();
 	if (IsPedInControl()) {
-		if (!m_pMyVehicle || wanted->m_nWantedLevel != 0)  {
+		if (!m_pMyVehicle || wanted->GetWantedLevel() != 0)  {
 			if (m_pMyVehicle && (m_pMyVehicle->GetPosition() - GetPosition()).MagnitudeSqr() < sq(5.0f)) {
 				m_nLastPedState = PED_IDLE;
 				SetSeek((CEntity*)m_pMyVehicle, 2.5f);
@@ -295,7 +293,7 @@ CCopPed::ScanForCrimes(void)
 	if (!m_bIsInPursuit) {
 		CPlayerPed *player = FindPlayerPed();
 		if ((m_objective == OBJECTIVE_ENTER_CAR_AS_DRIVER || m_objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER)
-			&& player->m_pWanted->m_nWantedLevel == 0) {
+			&& player->m_pWanted->GetWantedLevel() == 0) {
 
 			if (player->m_pMyVehicle
 #ifdef FIX_BUGS
@@ -311,7 +309,7 @@ void
 CCopPed::CopAI(void)
 {
 	CWanted *wanted = FindPlayerPed()->m_pWanted;
-	int wantedLevel = wanted->m_nWantedLevel;
+	int wantedLevel = wanted->GetWantedLevel();
 	CPhysical *playerOrHisVeh = FindPlayerVehicle() ? (CPhysical*)FindPlayerVehicle() : (CPhysical*)FindPlayerPed();
 
 	if (wanted->m_bIgnoredByEveryone || wanted->m_bIgnoredByCops) {
diff --git a/src/peds/EmergencyPed.cpp b/src/peds/EmergencyPed.cpp
index 2eabfe04..62b70d7d 100644
--- a/src/peds/EmergencyPed.cpp
+++ b/src/peds/EmergencyPed.cpp
@@ -9,8 +9,6 @@
 #include "CarCtrl.h"
 #include "Accident.h"
 
-// --MIAMI: file done
-
 CEmergencyPed::CEmergencyPed(uint32 type) : CPed(type)
 {
 	switch (type){
diff --git a/src/peds/Gangs.cpp b/src/peds/Gangs.cpp
index 7e120af9..e6de0770 100644
--- a/src/peds/Gangs.cpp
+++ b/src/peds/Gangs.cpp
@@ -6,8 +6,6 @@
 #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 8be58d66..354bda88 100644
--- a/src/peds/Ped.cpp
+++ b/src/peds/Ped.cpp
@@ -39,8 +39,6 @@
 #include "CutsceneShadow.h"
 #include "Clock.h"
 
-// --MIAMI: file done
-
 CPed *gapTempPedList[50];
 uint16 gnNumTempPedList;
 
@@ -61,7 +59,6 @@ void CPed::operator delete(void *p, int handle) { CPools::GetPedPool()->Delete((
 
 float gfTommyFatness = 1.0f;
 
-// --MIAMI: Done
 CPed::CPed(uint32 pedType) : m_pedIK(this)
 {
 #ifdef USE_CUTSCENE_SHADOW_FOR_PED
@@ -370,7 +367,6 @@ CPed::CPed(uint32 pedType) : m_pedIK(this)
 	m_lastComment = UINT32_MAX;
 }
 
-// --MIAMI: Done
 CPed::~CPed(void)
 {
 #ifdef USE_CUTSCENE_SHADOW_FOR_PED
@@ -407,7 +403,6 @@ CPed::~CPed(void)
 	DMAudio.DestroyEntity(m_audioEntityId);
 }
 
-// --MIAMI: Done
 void
 CPed::Initialise(void)
 {
@@ -418,7 +413,6 @@ CPed::Initialise(void)
 	debug("CPed ready\n");
 }
 
-// --MIAMI: Done
 void
 CPed::SetModelIndex(uint32 mi)
 {
@@ -450,21 +444,18 @@ CPed::SetModelIndex(uint32 mi)
 #endif
 }
 
-// --MIAMI: Done
 void
 CPed::SetPedStats(ePedStats pedStat)
 {
 	m_pedStats = CPedStats::ms_apPedStats[pedStat];
 }
 
-// --MIAMI: Done
 void
 CPed::DeleteRwObject()
 {
 	CEntity::DeleteRwObject();
 }
 
-// --MIAMI: Done
 void
 CPed::BuildPedLists(void)
 {
@@ -540,7 +531,6 @@ CPed::BuildPedLists(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::OurPedCanSeeThisOne(CEntity *target, bool shootablesDoBlock)
 {
@@ -562,7 +552,6 @@ CPed::OurPedCanSeeThisOne(CEntity *target, bool shootablesDoBlock)
 		colpoint, ent, true, false, false, shootablesDoBlock, false, false, false, shootablesDoBlock);
 }
 
-// --MIAMI: Done
 // Some kind of binary sort
 void
 CPed::SortPeds(CPed **list, int min, int max)
@@ -600,14 +589,12 @@ CPed::SortPeds(CPed **list, int min, int max)
 	SortPeds(list, right, max);
 }
 
-// --MIAMI: Done
 void
 CPed::SetMoveState(eMoveState state)
 {
 	m_nMoveState = state;
 }
 
-// --MIAMI: Done
 void
 CPed::SetMoveAnim(void)
 {
@@ -721,7 +708,6 @@ CPed::SetMoveAnim(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::StopNonPartialAnims(void)
 {
@@ -733,7 +719,6 @@ CPed::StopNonPartialAnims(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::RestartNonPartialAnims(void)
 {
@@ -745,7 +730,6 @@ CPed::RestartNonPartialAnims(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetStoredState(void)
 {
@@ -764,7 +748,6 @@ CPed::SetStoredState(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::RestorePreviousState(void)
 {
@@ -815,7 +798,6 @@ CPed::RestorePreviousState(void)
 	}
 }
 
-// --MIAMI: Done
 uint32
 CPed::ScanForThreats(void)
 {
@@ -976,7 +958,6 @@ CPed::ScanForThreats(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ScanForDelayedResponseThreats(void)
 {
@@ -996,7 +977,6 @@ CPed::ScanForDelayedResponseThreats(void)
 	m_threatCheckTimer = 0;
 }
 
-// --MIAMI: Done
 void
 CPed::CheckThreatValidity(void)
 {
@@ -1012,7 +992,6 @@ CPed::CheckThreatValidity(void)
 		m_threatFlags = 0;
 }
 
-// --MIAMI: Done
 bool
 CPed::CanUseTorsoWhenLooking(void)
 {
@@ -1023,7 +1002,6 @@ CPed::CanUseTorsoWhenLooking(void)
 	return false;
 }
 
-// --MIAMI: Done
 void
 CPed::SetLookFlag(float direction, bool keepTryingToLook, bool cancelPrevious)
 {
@@ -1040,7 +1018,6 @@ CPed::SetLookFlag(float direction, bool keepTryingToLook, bool cancelPrevious)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetLookFlag(CEntity *target, bool keepTryingToLook, bool cancelPrevious)
 {
@@ -1058,7 +1035,6 @@ CPed::SetLookFlag(CEntity *target, bool keepTryingToLook, bool cancelPrevious)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearLookFlag(void) {
 	if (bIsLooking) {
@@ -1080,7 +1056,6 @@ CPed::ClearLookFlag(void) {
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::MoveHeadToLook(void)
 {
@@ -1159,7 +1134,6 @@ CPed::MoveHeadToLook(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::RestoreHeadPosition(void)
 {
@@ -1173,7 +1147,6 @@ CPed::RestoreHeadPosition(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetAimFlag(float angle)
 {
@@ -1193,7 +1166,6 @@ CPed::SetAimFlag(float angle)
 		m_pedIK.m_flags &= ~CPedIK::AIMS_WITH_ARM;
 }
 
-// --MIAMI: Done
 void
 CPed::SetAimFlag(CEntity *to)
 {
@@ -1210,7 +1182,6 @@ CPed::SetAimFlag(CEntity *to)
 	m_lookTimer = 0;
 }
 
-// --MIAMI: Done
 void
 CPed::ClearAimFlag(void)
 {
@@ -1225,7 +1196,6 @@ CPed::ClearAimFlag(void)
 		((CPlayerPed*)this)->m_fFPSMoveHeading = 0.0f;
 }
 
-// --MIAMI: Done
 void
 CPed::AimGun(void)
 {
@@ -1258,7 +1228,6 @@ CPed::AimGun(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::RestoreGunPosition(void)
 {
@@ -1273,14 +1242,12 @@ CPed::RestoreGunPosition(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::CanWeRunAndFireWithWeapon(void)
 {
 	return CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->IsFlagSet(WEAPONFLAG_CANAIM_WITHARM);
 }
 
-// --MIAMI: Done
 void
 CPed::ScanForInterestingStuff(void)
 {
@@ -1374,7 +1341,6 @@ CPed::ScanForInterestingStuff(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::WillChat(CPed *stranger)
 {
@@ -1400,7 +1366,6 @@ CPed::WillChat(CPed *stranger)
 	return true;
 }
 
-// --MIAMI: Done
 void
 CPed::CalculateNewVelocity(void)
 {
@@ -1492,7 +1457,6 @@ CPed::CalculateNewVelocity(void)
 	}
 }
 
-// --MIAMI: Done
 float
 CPed::WorkOutHeadingForMovingFirstPerson(float offset)
 {
@@ -1516,7 +1480,6 @@ CPed::WorkOutHeadingForMovingFirstPerson(float offset)
 	return CGeneral::LimitRadianAngle(offset + angle);
 }
 
-// --MIAMI: Done
 void
 CPed::UpdatePosition(void)
 {
@@ -1584,7 +1547,6 @@ CPed::UpdatePosition(void)
 	m_vecMoveSpeed.y += velocityChange.y;
 }
 
-// --MIAMI: Done
 void
 CPed::CalculateNewOrientation(void)
 {
@@ -1594,7 +1556,6 @@ CPed::CalculateNewOrientation(void)
 	SetHeading(m_fRotationCur);
 }
 
-// --MIAMI: Done
 void
 CPed::ClearAll(void)
 {
@@ -1618,7 +1579,6 @@ CPed::ClearAll(void)
 	m_pCollidingEntity = nil;
 }
 
-// --MIAMI: Done
 void
 CPed::ProcessBuoyancy(void)
 {
@@ -1737,7 +1697,6 @@ CPed::ProcessBuoyancy(void)
 		bTouchingWater = false;
 }
 
-// --MIAMI: Done?
 void
 CPed::ProcessControl(void)
 {
@@ -2878,7 +2837,6 @@ CPed::ProcessControl(void)
 		ServiceTalking();
 }
 
-// --MIAMI: Done
 int32
 CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 {
@@ -3084,7 +3042,6 @@ CPed::ProcessEntityCollision(CEntity *collidingEnt, CColPoint *collidingPoints)
 	return ourCollidedSpheres;
 }
 
-// --MIAMI: Done
 static void
 particleProduceFootSplash(CPed *ped, CVector const &pos, float size, int times)
 {
@@ -3098,7 +3055,6 @@ particleProduceFootSplash(CPed *ped, CVector const &pos, float size, int times)
 	}
 }
 
-// --MIAMI: Done
 static void
 particleProduceFootDust(CPed *ped, CVector const &pos, float size, int times)
 {
@@ -3125,7 +3081,6 @@ particleProduceFootDust(CPed *ped, CVector const &pos, float size, int times)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PlayFootSteps(void)
 {
@@ -3384,7 +3339,6 @@ CPed::PlayFootSteps(void)
 	}
 }
 
-// --MIAMI: Done
 // Actually GetLocalDirectionTo(Turn/Look)
 int
 CPed::GetLocalDirection(const CVector2D &posOffset)
@@ -3400,14 +3354,12 @@ CPed::GetLocalDirection(const CVector2D &posOffset)
 	return direction;
 }
 
-// --MIAMI: Done
 bool
 CPed::SetDirectionToWalkAroundVehicle(CVehicle* veh)
 {
 	return SetFollowPath(m_vecSeekPos, 0.0f, m_nMoveState, veh, m_pedInObjective, m_nMoveState == PEDMOVE_WALK ? 2000 : 250);
 }
 
-// --MIAMI: Done
 void
 CPed::SetDirectionToWalkAroundObject(CEntity *obj)
 {
@@ -3860,7 +3812,6 @@ CPed::SetDirectionToWalkAroundObject(CEntity *obj)
 	m_nPedStateTimer = CTimer::GetTimeInMilliseconds() + 280.0f * dist * checkIntervalInTime;
 }
 
-// --MIAMI: Done
 bool
 CPed::IsPedInControl(void)
 {
@@ -3869,14 +3820,12 @@ CPed::IsPedInControl(void)
 		&& m_fHealth > 0.0f;
 }
 
-// --MIAMI: Done
 bool
 CPed::IsPedShootable(void)
 {
 	return m_nPedState <= PED_STATES_NO_ST;
 }
 
-// --MIAMI: Done
 bool
 CPed::UseGroundColModel(void)
 {
@@ -3886,7 +3835,6 @@ CPed::UseGroundColModel(void)
 		m_nPedState == PED_DEAD;
 }
 
-// --MIAMI: Done
 bool
 CPed::CanPedReturnToState(void)
 {
@@ -3894,14 +3842,12 @@ CPed::CanPedReturnToState(void)
 		m_nPedState != PED_FIGHT && m_nPedState != PED_STEP_AWAY && m_nPedState != PED_SNIPER_MODE && m_nPedState != PED_LOOK_ENTITY;
 }
 
-// --MIAMI: Done
 bool
 CPed::CanSetPedState(void)
 {
 	return !DyingOrDead() && m_nPedState != PED_ARRESTED && !EnteringCar() && m_nPedState != PED_STEAL_CAR;
 }
 
-// --MIAMI: Done
 bool
 CPed::CanStrafeOrMouseControl(void)
 {
@@ -3913,7 +3859,6 @@ CPed::CanStrafeOrMouseControl(void)
 		m_nPedState == PED_ATTACK || m_nPedState == PED_FIGHT || m_nPedState == PED_AIM_GUN || m_nPedState == PED_JUMP || m_nPedState == PED_ANSWER_MOBILE;
 }
 
-// --MIAMI: Done
 void
 CPed::PedSetPreviousStateCB(CAnimBlendAssociation* assoc, void* arg)
 {
@@ -3922,7 +3867,6 @@ CPed::PedSetPreviousStateCB(CAnimBlendAssociation* assoc, void* arg)
 	ped->m_pVehicleAnim = nil;
 }
 
-// --MIAMI: Done
 void
 CPed::PedGetupCB(CAnimBlendAssociation* animAssoc, void* arg)
 {
@@ -3958,7 +3902,6 @@ CPed::PedGetupCB(CAnimBlendAssociation* animAssoc, void* arg)
 	ped->bGetUpAnimStarted = false;
 }
 
-// --MIAMI: Done
 void
 CPed::PedLandCB(CAnimBlendAssociation* animAssoc, void* arg)
 {
@@ -3971,7 +3914,6 @@ CPed::PedLandCB(CAnimBlendAssociation* animAssoc, void* arg)
 		ped->RestorePreviousState();
 }
 
-// --MIAMI: Done
 void
 CPed::PedStaggerCB(CAnimBlendAssociation* animAssoc, void* arg)
 {
@@ -3982,7 +3924,6 @@ CPed::PedStaggerCB(CAnimBlendAssociation* animAssoc, void* arg)
 		// nothing
 	*/
 }
-// --MIAMI: Done
 void
 CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -4163,7 +4104,6 @@ CPed::PedSetOutCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 	ped->bHeldHostageInCar = false;
 }
 
-// --MIAMI: Done
 void
 CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg)
 {
@@ -4240,7 +4180,6 @@ CPed::PedSetDraggedOutCarCB(CAnimBlendAssociation *dragAssoc, void *arg)
 	ped->bVehExitWillBeInstant = false;
 }
 
-// --MIAMI: Done
 void
 CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -4499,7 +4438,6 @@ CPed::PedSetInCarCB(CAnimBlendAssociation *animAssoc, void *arg)
 	ped->bChangedSeat = true;
 }
 
-// --MIAMI: Done
 bool
 CPed::CanBeDeleted(void)
 {
@@ -4518,7 +4456,6 @@ CPed::CanBeDeleted(void)
 	}
 }
 
-//--MIAMI: done
 bool
 CPed::CanBeDeletedEvenInVehicle(void)
 {
@@ -4534,7 +4471,6 @@ CPed::CanBeDeletedEvenInVehicle(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::AddWeaponModel(int id)
 {
@@ -4562,7 +4498,6 @@ RemoveAllModelCB(RwObject *object, void *data)
 	return object;
 }
 
-// --MIAMI: Done
 void
 CPed::RemoveWeaponModel(int modelId)
 {
@@ -4590,7 +4525,6 @@ CPed::RemoveWeaponModel(int modelId)
 	m_wepModelID = -1;
 }
 
-// --MIAMI: Done
 void
 CPed::RequestDelayedWeapon()
 {
@@ -4610,7 +4544,6 @@ CPed::RequestDelayedWeapon()
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::GiveDelayedWeapon(eWeaponType weapon, uint32 ammo)
 {
@@ -4632,7 +4565,6 @@ CPed::GiveDelayedWeapon(eWeaponType weapon, uint32 ammo)
 	}
 }
 
-// --MIAMI: Done
 int32
 CPed::GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused)
 {
@@ -4669,14 +4601,12 @@ CPed::GiveWeapon(eWeaponType weaponType, uint32 ammo, bool unused)
 	return slot;
 }
 
-// --MIAMI: Done
 int
 CPed::GetWeaponSlot(eWeaponType weaponType)
 {
 	return CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot;
 }
 
-// --MIAMI: Done
 void
 CPed::SetCurrentWeapon(int slot)
 {
@@ -4699,14 +4629,12 @@ CPed::SetCurrentWeapon(int slot)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetCurrentWeapon(eWeaponType weaponType)
 {
 	SetCurrentWeapon(CWeaponInfo::GetWeaponInfo(weaponType)->m_nWeaponSlot);
 }
 
-// --MIAMI: Done
 void
 CPed::GrantAmmo(eWeaponType weaponType, uint32 ammo)
 {
@@ -4727,7 +4655,6 @@ CPed::GrantAmmo(eWeaponType weaponType, uint32 ammo)
 		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
 }
 
-// --MIAMI: Done
 void
 CPed::SetAmmo(eWeaponType weaponType, uint32 ammo)
 {
@@ -4752,7 +4679,6 @@ CPed::SetAmmo(eWeaponType weaponType, uint32 ammo)
 		GetWeapon(slot).m_eWeaponState = WEAPONSTATE_READY;
 }
 
-// --MIAMI: Done
 void
 CPed::ClearWeapons(void)
 {
@@ -4763,7 +4689,6 @@ CPed::ClearWeapons(void)
 	SetCurrentWeapon(WEAPONTYPE_UNARMED);
 }
 
-// --MIAMI: Done
 void
 CPed::RemoveWeaponWhenEnteringVehicle(void)
 {
@@ -4776,14 +4701,13 @@ CPed::RemoveWeaponWhenEnteringVehicle(void)
 		RemoveWeaponModel(ourWeapon->m_nModelId);
 	}
 }
-// --MIAMI: Done, but enumarate weapon slots
 void
 CPed::ReplaceWeaponWhenExitingVehicle(void)
 {
 	eWeaponType weaponType = GetWeapon()->m_eWeaponType;
 
 	// If it's Uzi, we may have stored weapon. Uzi is the only gun we can use in car.
-	if (IsPlayer() && GetWeaponSlot(weaponType) == 5) {
+	if (IsPlayer() && GetWeaponSlot(weaponType) == WEAPONSLOT_SUBMACHINEGUN) {
 		if (m_storedWeapon != WEAPONTYPE_UNIDENTIFIED) {
 			SetCurrentWeapon(m_storedWeapon);
 			m_storedWeapon = WEAPONTYPE_UNIDENTIFIED;
@@ -4793,7 +4717,6 @@ CPed::ReplaceWeaponWhenExitingVehicle(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PreRender(void)
 {
@@ -5028,7 +4951,6 @@ CPed::PreRender(void)
 
 CVector vecTestTemp(-1.0f, -1.0f, -1.0f);
 
-// --MIAMI: Done
 void
 CPed::Render(void)
 {
@@ -5078,7 +5000,6 @@ CPed::Render(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::CheckAroundForPossibleCollisions(void)
 {
@@ -5111,7 +5032,6 @@ CPed::CheckAroundForPossibleCollisions(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetIdle(void)
 {
@@ -5128,7 +5048,6 @@ CPed::SetIdle(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::Idle(void)
 {
@@ -5156,14 +5075,12 @@ CPed::Idle(void)
 	m_moved = CVector2D(0.0f, 0.0f);
 }
 
-// --MIAMI: Done
 void
 CPed::ClearPause(void)
 {
 	RestorePreviousState();
 }
 
-// --MIAMI: Done
 void
 CPed::Pause(void)
 {
@@ -5172,7 +5089,6 @@ CPed::Pause(void)
 		ClearPause();
 }
 
-// --MIAMI: Done
 void
 CPed::SetFall(int extraTime, AnimationId animId, uint8 evenIfNotInControl)
 {
@@ -5238,14 +5154,12 @@ CPed::SetFall(int extraTime, AnimationId animId, uint8 evenIfNotInControl)
 	bFallenDown = true;
 }
 
-// --MIAMI: Done
 void
 CPed::ClearFall(void)
 {
 	SetGetUp();
 }
 
-// --MIAMI: Done
 void
 CPed::Fall(void)
 {
@@ -5304,7 +5218,6 @@ CPed::Fall(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::CheckIfInTheAir(void)
 {
@@ -5326,7 +5239,6 @@ CPed::CheckIfInTheAir(void)
 	return !foundGround;
 }
 
-// --MIAMI: Done
 void
 CPed::SetInTheAir(void)
 {
@@ -5345,7 +5257,6 @@ CPed::SetInTheAir(void)
 
 }
 
-// --MIAMI: Done
 void
 CPed::InTheAir(void)
 {
@@ -5369,7 +5280,6 @@ CPed::InTheAir(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetLanding(void)
 {
@@ -5405,7 +5315,6 @@ CPed::SetLanding(void)
 	bIsLanding = true;
 }
 
-// --MIAMI: Done
 void
 CPed::SetGetUp(void)
 {
@@ -5476,7 +5385,6 @@ CPed::SetGetUp(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::Mug(void)
 {
@@ -5498,7 +5406,6 @@ CPed::Mug(void)
 	}
 }
 
-// --MIAMI: Done
 // Unused
 void
 CPed::SetLook(float direction)
@@ -5510,7 +5417,6 @@ CPed::SetLook(float direction)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetLook(CEntity* to)
 {
@@ -5521,7 +5427,6 @@ CPed::SetLook(CEntity* to)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetLookTimer(int time)
 {
@@ -5530,7 +5435,6 @@ CPed::SetLookTimer(int time)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetAttackTimer(uint32 time)
 {
@@ -5538,7 +5442,6 @@ CPed::SetAttackTimer(uint32 time)
 		m_attackTimer = Max(m_shootTimer, CTimer::GetTimeInMilliseconds()) + time;
 }
 
-// --MIAMI: Done
 void
 CPed::SetShootTimer(uint32 time)
 {
@@ -5547,7 +5450,6 @@ CPed::SetShootTimer(uint32 time)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearLook(void)
 {
@@ -5555,14 +5457,12 @@ CPed::ClearLook(void)
 	ClearLookFlag();
 }
 
-// --MIAMI: Done
 void
 CPed::Look(void)
 {
 	TurnBody();
 }
 
-// --MIAMI: Done
 bool
 CPed::TurnBody(void)
 {
@@ -5596,7 +5496,6 @@ CPed::TurnBody(void)
 	return turnDone;
 }
 
-// --MIAMI: Done
 void
 CPed::SetSeek(CVector pos, float distanceToCountDone)
 {
@@ -5615,7 +5514,6 @@ CPed::SetSeek(CVector pos, float distanceToCountDone)
 	m_distanceToCountSeekDone = distanceToCountDone;
 	m_vecSeekPos = pos;
 }
-// --MIAMI: Done
 void
 CPed::SetSeek(CEntity *seeking, float distanceToCountDone)
 {
@@ -5638,7 +5536,6 @@ CPed::SetSeek(CEntity *seeking, float distanceToCountDone)
 	SetMoveState(PEDMOVE_STILL);
 }
 
-// --MIAMI: Done
 void
 CPed::ClearSeek(void)
 {
@@ -5646,7 +5543,6 @@ CPed::ClearSeek(void)
 	bRunningToPhone = false;
 }
 
-// --MIAMI: Done
 bool
 CPed::Seek(void)
 {
@@ -5819,7 +5715,6 @@ CPed::Seek(void)
 	return true;
 }
 
-// --MIAMI: Done
 void
 CPed::SetFlee(CVector2D const &from, int time)
 {
@@ -5849,7 +5744,6 @@ CPed::SetFlee(CVector2D const &from, int time)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetFlee(CEntity *fleeFrom, int time)
 {
@@ -5880,7 +5774,6 @@ CPed::SetFlee(CEntity *fleeFrom, int time)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearFlee(void)
 {
@@ -5890,7 +5783,6 @@ CPed::ClearFlee(void)
 	m_fleeTimer = 0;
 }
 
-// --MIAMI: Done
 void
 CPed::Flee(void)
 {
@@ -6078,7 +5970,6 @@ CPed::WanderRange(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::SetWanderPath(int8 pathStateDest)
 {
@@ -6127,7 +6018,6 @@ CPed::SetWanderPath(int8 pathStateDest)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::WanderPath(void)
 {
@@ -6235,7 +6125,6 @@ CPed::WanderPath(void)
 		Say(SOUND_PED_WAIT_DOUBLEBACK);
 	}
 }
-// --MIAMI: Done
 void
 CPed::Avoid(void)
 {
@@ -6284,7 +6173,6 @@ CPed::Avoid(void)
 	}
 }
 
-// --MIAMI: Done
 CVector*
 CPed::SeekFollowingPath(void)
 {
@@ -6306,7 +6194,6 @@ CPed::SeekFollowingPath(void)
 		return &vecNextPathNode;
 }
 
-// --MIAMI: Done
 bool
 CPed::SetFollowPath(CVector dest, float radius, eMoveState state, CEntity* walkAroundEnt, CEntity* targetEnt, int time)
 {
@@ -6359,7 +6246,6 @@ CPed::SetFollowPath(CVector dest, float radius, eMoveState state, CEntity* walkA
 		return SetFollowPathStatic();
 }
 
-// --MIAMI: Done
 bool
 CPed::SetFollowPathStatic(void)
 {
@@ -6428,7 +6314,6 @@ CPed::SetFollowPathStatic(void)
 	return true;
 }
 
-// --MIAMI: Done
 bool
 CPed::SetFollowPathDynamic(void)
 {
@@ -6812,7 +6697,6 @@ CPed::SetFollowPathDynamic(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearFollowPath()
 {
@@ -6823,7 +6707,6 @@ CPed::ClearFollowPath()
 	m_nCurPathNodeId = 0;
 }
 
-// --MIAMI: Done
 void
 CPed::FollowPath(void)
 {
@@ -6854,7 +6737,6 @@ CPed::FollowPath(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetEvasiveStep(CEntity *reason, uint8 animType)
 {
@@ -6930,7 +6812,6 @@ CPed::SetEvasiveStep(CEntity *reason, uint8 animType)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump)
 {
@@ -7050,7 +6931,6 @@ CPed::SetEvasiveDive(CPhysical *reason, uint8 onlyRandomJump)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PedEvadeCB(CAnimBlendAssociation* animAssoc, void* arg)
 {
@@ -7088,7 +6968,6 @@ CPed::PedEvadeCB(CAnimBlendAssociation* animAssoc, void* arg)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetDie(AnimationId animId, float delta, float speed)
 {
@@ -7152,7 +7031,6 @@ CPed::SetDie(AnimationId animId, float delta, float speed)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::FinishDieAnimCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -7162,7 +7040,6 @@ CPed::FinishDieAnimCB(CAnimBlendAssociation *animAssoc, void *arg)
 		ped->bIsPedDieAnimPlaying = false;
 }
 
-// --MIAMI: Done
 void
 CPed::SetDead(void)
 {
@@ -7195,14 +7072,12 @@ CPed::SetDead(void)
 	CEventList::RegisterEvent(EVENT_DEAD_PED, EVENT_ENTITY_PED, this, nil, 1000);
 }
 
-// --MIAMI: Done
 void
 CPed::Die(void)
 {
 	// UNUSED: This is a perfectly empty function.
 }
 
-// --MIAMI: Done
 void
 CPed::SetChat(CEntity *chatWith, uint32 time)
 {
@@ -7219,7 +7094,6 @@ CPed::SetChat(CEntity *chatWith, uint32 time)
 	m_lookTimer = CTimer::GetTimeInMilliseconds() + 3000;
 }
 
-// --MIAMI: Done
 void
 CPed::Chat(void)
 {
@@ -7275,7 +7149,6 @@ CPed::Chat(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearChat(void)
 {
@@ -7294,7 +7167,6 @@ CPed::ClearChat(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::FacePhone(void)
 {
@@ -7343,7 +7215,6 @@ CPed::FacePhone(void)
 #endif
 }
 
-// --MIAMI: Done
 bool
 CPed::MakePhonecall(void)
 {
@@ -7356,7 +7227,6 @@ CPed::MakePhonecall(void)
 	return true;
 }
 
-// --MIAMI: Done
 void
 StartTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg)
 {
@@ -7365,7 +7235,6 @@ StartTalkingOnMobileCB(CAnimBlendAssociation* assoc, void* arg)
 		CAnimManager::BlendAnimation(ped->GetClump(), ASSOCGRP_STD, ANIM_PHONE_TALK, 4.0f);
 }
 
-// --MIAMI: Done
 void
 FinishTalkingOnMobileCB(CAnimBlendAssociation *assoc, void *arg)
 {
@@ -7378,7 +7247,6 @@ FinishTalkingOnMobileCB(CAnimBlendAssociation *assoc, void *arg)
 	ped->m_lookTimer = 0;
 }
 
-// --MIAMI: Done
 void
 CPed::SetAnswerMobile(void)
 {
@@ -7395,7 +7263,6 @@ CPed::SetAnswerMobile(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearAnswerMobile(void)
 {
@@ -7415,7 +7282,6 @@ CPed::ClearAnswerMobile(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::AnswerMobile(void)
 {
@@ -7448,7 +7314,6 @@ CPed::AnswerMobile(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::Teleport(CVector pos)
 {
@@ -7462,7 +7327,6 @@ CPed::Teleport(CVector pos)
 	CWorld::Add(this);
 }
 
-// --MIAMI: Done
 void
 CPed::SetSeekCar(CVehicle *car, uint32 doorNode)
 {
@@ -7486,7 +7350,6 @@ CPed::SetSeekCar(CVehicle *car, uint32 doorNode)
 
 }
 
-// --MIAMI: Done
 void
 CPed::SeekCar(void)
 {
@@ -7669,7 +7532,6 @@ CPed::SeekCar(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::CheckForExplosions(CVector2D &area)
 {
@@ -7714,7 +7576,6 @@ CPed::CheckForExplosions(CVector2D &area)
 	return false;
 }
 
-// --MIAMI: Done
 CPed *
 CPed::CheckForGunShots(void)
 {
@@ -7730,7 +7591,6 @@ CPed::CheckForGunShots(void)
 	return nil;
 }
 
-// --MIAMI: Done
 CPed *
 CPed::CheckForDeadPeds(void)
 {
@@ -7746,7 +7606,6 @@ CPed::CheckForDeadPeds(void)
 	return nil;
 }
 
-// --MIAMI: Done
 bool
 CPed::IsPlayer(void) const
 {
@@ -7759,14 +7618,12 @@ CPed::IsPlayer(void) const
 #endif
 }
 
-// --MIAMI: Done
 bool
 CPed::IsGangMember(void) const
 {
 	return m_nPedType >= PEDTYPE_GANG1 && m_nPedType <= PEDTYPE_GANG9;
 }
 
-// --MIAMI: Done
 bool
 IsPedPointerValid(CPed* pPed)
 {
@@ -7777,7 +7634,6 @@ IsPedPointerValid(CPed* pPed)
 	return pPed->m_entryInfoList.first || pPed == FindPlayerPed();
 }
 
-// --MIAMI: Done
 bool
 IsPedPointerValid_NotInWorld(CPed* pPed)
 {
@@ -7793,7 +7649,6 @@ IsPedPointerValid_NotInWorld(CPed* pPed)
 	return true;
 }
 
-// --MIAMI: Done
 bool
 CPed::IsPointerValid(void)
 {
@@ -7807,7 +7662,6 @@ CPed::IsPointerValid(void)
 	return false;
 }
 
-// --MIAMI: Done
 void
 CPed::SetPedPositionInCar(void)
 {
@@ -7900,7 +7754,6 @@ CPed::SetPedPositionInCar(void)
 	GetMatrix() = newMat;
 }
 
-// --MIAMI: Done
 void
 CPed::LookForSexyPeds(void)
 {
@@ -7926,7 +7779,6 @@ CPed::LookForSexyPeds(void)
 	m_lookTimer = CTimer::GetTimeInMilliseconds() + 10000;
 }
 
-// --MIAMI: Done
 void
 CPed::LookForSexyCars(void)
 {
@@ -7956,7 +7808,6 @@ CPed::LookForSexyCars(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::LookForInterestingNodes(void)
 {
@@ -8098,7 +7949,6 @@ CPed::LookForInterestingNodes(void)
 	return true;
 }
 
-// --MIAMI: Done
 void
 PlayRandomAnimationsFromAnimBlock(CPed* ped, AssocGroupId animGroup, uint32 first, uint32 amount)
 {
@@ -8135,7 +7985,6 @@ PlayRandomAnimationsFromAnimBlock(CPed* ped, AssocGroupId animGroup, uint32 firs
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearWaitState(void)
 {
@@ -8239,7 +8088,6 @@ CPed::ClearWaitState(void)
 	m_nWaitState = WAITSTATE_FALSE;
 }
 
-// --MIAMI: Done
 void
 CPed::SetWaitState(eWaitState state, void *time)
 {
@@ -8459,7 +8307,6 @@ CPed::SetWaitState(eWaitState state, void *time)
 	m_nWaitState = state;
 }
 
-// --MIAMI: Done
 void
 CPed::Wait(void)
 {
@@ -8903,7 +8750,6 @@ CPed::Wait(void)
 		RestoreHeadingRate();
 }
 
-// --MIAMI: Done
 void
 CPed::DeleteSunbatheIdleAnimCB(CAnimBlendAssociation *assoc, void *arg)
 {
@@ -8922,7 +8768,6 @@ CPed::DeleteSunbatheIdleAnimCB(CAnimBlendAssociation *assoc, void *arg)
 	ped->Wait();
 }
 
-// --MIAMI: Done
 void
 CPed::FinishedWaitCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -8933,21 +8778,18 @@ CPed::FinishedWaitCB(CAnimBlendAssociation *animAssoc, void *arg)
 	ped->Wait();
 }
 
-// --MIAMI: Done
 void
 CPed::RestoreHeadingRate(void)
 {
 	m_headingRate = m_pedStats->m_headingChangeRate;
 }
 
-// --MIAMI: Done
 void
 CPed::RestoreHeadingRateCB(CAnimBlendAssociation *assoc, void *arg)
 {
 	((CPed*)arg)->RestoreHeadingRate();
 }
 
-// --MIAMI: Done
 void
 CPed::FlagToDestroyWhenNextProcessed(void)
 {
@@ -8971,7 +8813,6 @@ CPed::FlagToDestroyWhenNextProcessed(void)
 	m_pVehicleAnim = nil;
 }
 
-// --MIAMI: Done
 void
 CPed::SetSolicit(uint32 time)
 {
@@ -8997,7 +8838,6 @@ CPed::SetSolicit(uint32 time)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::Solicit(void)
 {
@@ -9043,7 +8883,6 @@ CPed::Solicit(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetBuyIceCream(void)
 {
@@ -9056,7 +8895,6 @@ CPed::SetBuyIceCream(void)
 	SetPedState(PED_BUY_ICECREAM);
 }
 
-// --MIAMI: Done
 void
 CPed::BuyIceCream(void)
 {
@@ -9075,7 +8913,6 @@ CPed::BuyIceCream(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::PossiblyFindBetterPosToSeekCar(CVector *pos, CVehicle *veh)
 {
@@ -9209,7 +9046,6 @@ CPed::PossiblyFindBetterPosToSeekCar(CVector *pos, CVehicle *veh)
 	return true;
 }
 
-// --MIAMI: Done
 void
 CPed::SetLeader(CEntity *leader)
 {
@@ -9221,7 +9057,6 @@ CPed::SetLeader(CEntity *leader)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::CanPedJumpThis(CEntity *unused, CVector *damageNormal)
 {
@@ -9254,7 +9089,6 @@ CPed::CanPedJumpThis(CEntity *unused, CVector *damageNormal)
 	return CWorld::GetIsLineOfSightClear(pos, forwardPos, true, false, false, true, false, false, false);
 }
 
-// --MIAMI: Done
 void
 CPed::SetJump(void)
 {
@@ -9269,7 +9103,6 @@ CPed::SetJump(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::FinishLaunchCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -9379,7 +9212,6 @@ CPed::FinishLaunchCB(CAnimBlendAssociation *animAssoc, void *arg)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::FinishJumpCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -9391,7 +9223,6 @@ CPed::FinishJumpCB(CAnimBlendAssociation *animAssoc, void *arg)
 	animAssoc->blendDelta = -1000.0f;
 }
 
-// --MIAMI: Done
 void
 CPed::FinishHitHeadCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -9408,7 +9239,6 @@ CPed::FinishHitHeadCB(CAnimBlendAssociation *animAssoc, void *arg)
 	ped->bIsLanding = false;
 }
 
-// --MIAMI: Done
 bool
 CPed::CanPedDriveOff(void)
 {
@@ -9424,7 +9254,6 @@ CPed::CanPedDriveOff(void)
 	}
 	return true;
 }
-// --MIAMI: Done
 void
 CPed::SetRadioStation(void)
 {
@@ -9445,7 +9274,6 @@ CPed::SetRadioStation(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::WarpPedIntoCar(CVehicle *car) // LCS TODO: remove passenger logic
 {
@@ -9586,14 +9414,12 @@ CPed::WarpPedIntoCarAsPassenger(CVehicle* pVehicle, int32 position)
 	bChangedSeat = true;
 }
 
-// --MIAMI: Done
 bool
 CPed::HasAttractor(void)
 {
 	return m_attractor != nil;
 }
 
-// --MIAMI: Done
 void
 CPed::SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float heading, float time, int32 qid)
 {
@@ -9614,7 +9440,6 @@ CPed::SetNewAttraction(CPedAttractor* pAttractor, const CVector& pos, float head
 	m_positionInQueue = qid;
 }
 
-// --MIAMI: Done
 void
 CPed::AttachPedToEntity(CEntity *ent, CVector offset, uint16 type, float rot, eWeaponType weapon)
 {
@@ -9662,7 +9487,6 @@ CPed::AttachPedToEntity(CEntity *ent, CVector offset, uint16 type, float rot, eW
 	PositionAttachedPed();
 }
 
-// --MIAMI: Done
 void
 CPed::DettachPedFromEntity(void)
 {
@@ -9686,7 +9510,6 @@ CPed::DettachPedFromEntity(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PositionAttachedPed()
 {
@@ -9738,7 +9561,6 @@ CPed::PositionAttachedPed()
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::Undress(const char* name)
 {
@@ -9754,7 +9576,6 @@ CPed::Undress(const char* name)
 	CWorld::Remove(this);
 }
 
-// --MIAMI: Done
 void
 CPed::Dress(void)
 {
diff --git a/src/peds/PedAI.cpp b/src/peds/PedAI.cpp
index 8b832670..d0f155c5 100644
--- a/src/peds/PedAI.cpp
+++ b/src/peds/PedAI.cpp
@@ -30,8 +30,6 @@
 #include "GameLogic.h"
 #include "Streaming.h"
 
-//--MIAMI: file done
-
 CVector vecPedCarDoorAnimOffset;
 CVector vecPedCarDoorLoAnimOffset;
 CVector vecPedVanRearDoorAnimOffset;
@@ -44,7 +42,6 @@ CVector vecPedHarleyBikeJumpRhsAnimOffset;
 CVector vecPedDirtBikeJumpRhsAnimOffset;
 CVector vecPedBikeKickAnimOffset;
 
-// --MIAMI: Done
 void
 CPed::SetObjectiveTimer(int time)
 {
@@ -55,7 +52,6 @@ CPed::SetObjectiveTimer(int time)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetStoredObjective(void)
 {
@@ -90,7 +86,6 @@ CPed::SetStoredObjective(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ForceStoredObjective(eObjective objective)
 {
@@ -124,7 +119,6 @@ CPed::ForceStoredObjective(eObjective objective)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::IsTemporaryObjective(eObjective objective)
 {
@@ -133,7 +127,6 @@ CPed::IsTemporaryObjective(eObjective objective)
 		objective == OBJECTIVE_ENTER_CAR_AS_PASSENGER;
 }
 
-// --MIAMI: Done
 void
 CPed::SetObjective(eObjective newObj)
 {
@@ -180,7 +173,6 @@ CPed::SetObjective(eObjective newObj)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetObjective(eObjective newObj, void *entity)
 {
@@ -415,7 +407,6 @@ CPed::SetObjective(eObjective newObj, CVector dest, float safeDist)
 	}
 }
 
-// --MIAMI: Done
 // Only used in 01E1: SET_CHAR_OBJ_FOLLOW_ROUTE opcode
 // IDA fails very badly in here, puts a fake loop and ignores SetFollowRoute call...
 void
@@ -448,7 +439,6 @@ CPed::SetObjective(eObjective newObj, int16 routePoint, int16 routeType)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetObjective(eObjective newObj, CVector dest)
 {
@@ -588,7 +578,6 @@ CPed::SetObjective(eObjective newObj, CVector dest)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
 {
@@ -605,7 +594,6 @@ CPed::SetObjective(eObjective newObj, float heading, const CVector& pos)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearObjective(void)
 {
@@ -631,7 +619,6 @@ CPed::ClearObjective(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearLeader(void)
 {
@@ -651,7 +638,6 @@ CPed::ClearLeader(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::UpdateFromLeader(void)
 {
@@ -810,7 +796,6 @@ CPed::UpdateFromLeader(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::RestorePreviousObjective(void)
 {
@@ -833,7 +818,6 @@ CPed::RestorePreviousObjective(void)
 	bObjectiveCompleted = false;
 }
 
-// --MIAMI: Done
 void
 CPed::ProcessObjective(void)
 {
@@ -969,7 +953,7 @@ CPed::ProcessObjective(void)
 								m_pMyVehicle->SetStatus(STATUS_PHYSICS);
 								m_pMyVehicle->AutoPilot.m_nPrevRouteNode = 0;
 								if (m_nPedType == PEDTYPE_COP) {
-									m_pMyVehicle->AutoPilot.m_nCruiseSpeed = (FindPlayerPed()->m_pWanted->m_nWantedLevel * 0.1f + 0.6f) * (GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fMaxCruiseVelocity);
+									m_pMyVehicle->AutoPilot.m_nCruiseSpeed = (FindPlayerPed()->m_pWanted->GetWantedLevel() * 0.1f + 0.6f) * (GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fMaxCruiseVelocity);
 									m_pMyVehicle->AutoPilot.m_nCarMission = CCarAI::FindPoliceCarMissionForWantedLevel();
 								} else {
 									m_pMyVehicle->AutoPilot.m_nCruiseSpeed = GAME_SPEED_TO_CARAI_SPEED * m_pMyVehicle->pHandling->Transmission.fMaxCruiseVelocity * 0.8f;
@@ -2105,7 +2089,6 @@ CPed::ProcessObjective(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetFollowRoute(int16 currentPoint, int16 routeType)
 {
@@ -2118,7 +2101,6 @@ CPed::SetFollowRoute(int16 currentPoint, int16 routeType)
 	m_nextRoutePointPos = CRouteNode::GetPointPosition(GetNextPointOnRoute());
 }
 
-// --MIAMI: Done
 int
 CPed::GetNextPointOnRoute(void)
 {
@@ -2146,7 +2128,6 @@ CPed::GetNextPointOnRoute(void)
 	return nextPoint;
 }
 
-// --MIAMI: Done
 bool
 CPed::HaveReachedNextPointOnRoute(float distToCountReached)
 {
@@ -2157,7 +2138,6 @@ CPed::HaveReachedNextPointOnRoute(float distToCountReached)
 	return false;
 }
 
-// --MIAMI: Done
 bool
 CPed::CanSeeEntity(CEntity *entity, float threshold)
 {
@@ -2183,7 +2163,6 @@ CPed::CanSeeEntity(CEntity *entity, float threshold)
 	return neededTurn < threshold || TWOPI - threshold < neededTurn;
 }
 
-// --MIAMI: Done
 // Only used while deciding which gun ped should switch to, if no ammo left.
 bool
 CPed::SelectGunIfArmed(void)
@@ -2204,7 +2183,6 @@ CPed::SelectGunIfArmed(void)
 	SetCurrentWeapon(WEAPONTYPE_UNARMED);
 	return false;
 }
-// --MIAMI: Done
 void
 CPed::ReactToPointGun(CEntity *entWithGun)
 {
@@ -2289,7 +2267,6 @@ CPed::ReactToPointGun(CEntity *entWithGun)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ReactToAttack(CEntity *attacker)
 {
@@ -2362,7 +2339,6 @@ CPed::ReactToAttack(CEntity *attacker)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -2607,7 +2583,6 @@ CPed::PedAnimAlignCB(CAnimBlendAssociation *animAssoc, void *arg)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
 {
@@ -2827,7 +2802,6 @@ CPed::PedAnimDoorOpenCB(CAnimBlendAssociation* animAssoc, void* arg)
 	return;
 }
 
-// --MIAMI: Done
 void
 CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
 {
@@ -2913,7 +2887,6 @@ CPed::PedAnimPullPedOutCB(CAnimBlendAssociation* animAssoc, void* arg)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -3063,7 +3036,6 @@ CPed::PedAnimGetInCB(CAnimBlendAssociation *animAssoc, void *arg)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PedShuffle(void)
 {
@@ -3079,7 +3051,6 @@ CPed::PedShuffle(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -3146,7 +3117,6 @@ CPed::PedAnimDoorCloseCB(CAnimBlendAssociation *animAssoc, void *arg)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg)
 {
@@ -3158,7 +3128,6 @@ CPed::PedAnimShuffleCB(CAnimBlendAssociation* assoc, void* arg)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetFormation(eFormation type)
 {
@@ -3182,7 +3151,6 @@ CPed::SetFormation(eFormation type)
 	m_pedFormation = type;
 }
 
-// --MIAMI: Done
 CVector
 CPed::GetFormationPosition(void)
 {
@@ -3231,7 +3199,6 @@ CPed::GetFormationPosition(void)
 	return m_pedInObjective->GetMatrix() * formationOffset;
 }
 
-// --MIAMI: Done
 void
 CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
 {
@@ -3371,7 +3338,6 @@ CPed::PedAnimStepOutCarCB(CAnimBlendAssociation* animAssoc, void* arg)
 	return;
 }
 
-// --MIAMI: Done
 void
 CPed::LineUpPedWithCar(PedLineUpPhase phase)
 {
@@ -3708,7 +3674,6 @@ CPed::LineUpPedWithCar(PedLineUpPhase phase)
 
 }
 
-// --MIAMI: Done
 void
 CPed::SetCarJack(CVehicle* car)
 {
@@ -3791,7 +3756,6 @@ CPed::SetCarJack(CVehicle* car)
 						SetCarJack_AllClear(car, m_vehDoor, doorFlag);
 }
 
-// --MIAMI: Done
 void
 CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag)
 {
@@ -3834,7 +3798,6 @@ CPed::SetCarJack_AllClear(CVehicle* car, uint32 doorNode, uint32 doorFlag)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack)
 {
@@ -3883,7 +3846,6 @@ CPed::SetBeingDraggedFromCar(CVehicle *veh, uint32 vehEnterType, bool quickJack)
 		veh->m_nGettingOutFlags |= GetCarDoorFlag(m_vehDoor);
 }
 
-// --MIAMI: Done
 void
 CPed::BeingDraggedFromCar(void)
 {
@@ -3949,7 +3911,6 @@ CPed::BeingDraggedFromCar(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetEnterCar(CVehicle *car, uint32 unused)
 {
@@ -4026,7 +3987,6 @@ CPed::SetEnterCar(CVehicle *car, uint32 unused)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
 {
@@ -4079,7 +4039,6 @@ CPed::SetEnterCar_AllClear(CVehicle *car, uint32 doorNode, uint32 doorFlag)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::EnterCar(void)
 {
@@ -4123,7 +4082,6 @@ CPed::EnterCar(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::QuitEnteringCar(void)
 {
@@ -4172,7 +4130,6 @@ CPed::QuitEnteringCar(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetExitBoat(CVehicle *boat)
 {
@@ -4230,7 +4187,6 @@ CPed::SetExitBoat(CVehicle *boat)
 	m_vecMoveSpeed = boat->m_vecMoveSpeed;
 }
 
-// --MIAMI: Done
 // wantedDoorNode = 0 means that func. will determine it
 void
 CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
@@ -4615,7 +4571,6 @@ CPed::SetExitCar(CVehicle *veh, uint32 wantedDoorNode)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ExitCar(void)
 {
@@ -4687,7 +4642,6 @@ CPed::ExitCar(void)
 	}
 }
 
-// --MIAMI: Done
 CVector
 CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component)
 {
@@ -4700,7 +4654,6 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component)
 	return vehDoorPos;
 }
 
-// --MIAMI: Done
 void
 CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen)
 {
@@ -4769,7 +4722,6 @@ CPed::GetNearestDoor(CVehicle *veh, CVector &posToOpen)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen)
 {
@@ -4853,7 +4805,6 @@ CPed::GetNearestPassengerDoor(CVehicle *veh, CVector &posToOpen)
 	return canEnter;
 }
 
-// --MIAMI: Done
 void
 CPed::GoToNearestDoor(CVehicle *veh)
 {
@@ -4863,7 +4814,6 @@ CPed::GoToNearestDoor(CVehicle *veh)
 	SetMoveState(PEDMOVE_RUN);
 }
 
-// --MIAMI: Done
 // Unused
 void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
 {
@@ -4877,7 +4827,6 @@ void CPed::PedSetGetInCarPositionCB(CAnimBlendAssociation* assoc, void* arg)
 	pPed->SetPosition(position);
 }
 
-// --MIAMI: Done
 void
 CPed::SetAnimOffsetForEnterOrExitVehicle(void)
 {
@@ -5039,7 +4988,6 @@ CPed::SetAnimOffsetForEnterOrExitVehicle(void)
 	CAnimManager::RemoveAnimBlockRef(bikedBlock);
 }
 
-// --MIAMI: Done
 void
 CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -5128,7 +5076,6 @@ CPed::PedSetQuickDraggedOutCarPositionCB(CAnimBlendAssociation *animAssoc, void
 		ped->m_nLastPedState = PED_WANDER_PATH;
 }
 
-// --MIAMI: Done
 void
 CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg)
 {
@@ -5225,7 +5172,6 @@ CPed::PedSetDraggedOutCarPositionCB(CAnimBlendAssociation* animAssoc, void* arg)
 	ped->SetGetUp();
 }
 
-// --MIAMI: Done
 uint8
 CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos)
 {
@@ -5243,7 +5189,6 @@ CPed::GetNearestTrainDoor(CVehicle *train, CVector &doorPos)
 	return 1;
 }
 
-// --MIAMI: Done
 uint8
 CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos)
 {
@@ -5302,7 +5247,6 @@ CPed::GetNearestTrainPedPosition(CVehicle *train, CVector &enterPos)
 	return 1;
 }
 
-// --MIAMI: Done :D
 void
 CPed::PedSetInTrainCB(CAnimBlendAssociation* animAssoc, void* arg)
 {
@@ -5452,7 +5396,6 @@ CPed::PedSetOutTrainCB(CAnimBlendAssociation *animAssoc, void *arg)
 }
 #endif
 
-// --MIAMI: Done
 void
 CPed::RegisterThreatWithGangPeds(CEntity *attacker)
 {
@@ -5516,7 +5459,6 @@ CPed::RegisterThreatWithGangPeds(CEntity *attacker)
 	}
 }
 
-// --MIAMI: Done
 // Some helper function which doesn't exist in og game.
 inline void
 SelectClosestNodeForSeek(CPed *ped, CPathNode *node, CVector2D closeDist, CVector2D farDist, CPathNode *closeNode, CPathNode *closeNode2, int runCount = 3)
@@ -5546,7 +5488,6 @@ SelectClosestNodeForSeek(CPed *ped, CPathNode *node, CVector2D closeDist, CVecto
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords)
 {
@@ -5587,7 +5528,6 @@ CPed::FindBestCoordsFromNodes(CVector unused, CVector *bestCoords)
 	return false;
 }
 
-// --MIAMI: Done
 bool
 CPed::DuckAndCover(void)
 {
@@ -5776,7 +5716,6 @@ CPed::DuckAndCover(void)
 	return false;
 }
 
-// --MIAMI: Done
 CVector
 CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset)
 {	
@@ -5824,7 +5763,6 @@ CPed::GetPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset)
 	return veh->GetPosition() + doorPos;
 }
 
-// --MIAMI: Done
 CVector
 CPed::GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float seatPosMult)
 {
@@ -5910,7 +5848,7 @@ CPed::GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float seatP
 	}
 }
 
-// --MIAMI: Done, but what is this parameter for?
+// TODO: what is this parameter for?
 void
 CPed::SetDuck(uint32 time, bool sth)
 {
@@ -5936,7 +5874,6 @@ CPed::SetDuck(uint32 time, bool sth)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::Duck(void)
 {
@@ -5963,7 +5900,6 @@ CPed::Duck(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearDuck(bool clearTimer)
 {
@@ -5986,7 +5922,6 @@ CPed::ClearDuck(bool clearTimer)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::InformMyGangOfAttack(CEntity *attacker)
 {
@@ -6021,7 +5956,6 @@ CPed::InformMyGangOfAttack(CEntity *attacker)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg)
 {
@@ -6044,7 +5978,6 @@ CPed::PedAnimDoorCloseRollingCB(CAnimBlendAssociation* animAssoc, void* arg)
 		veh->Damage.SetDoorStatus(DOOR_FRONT_LEFT, DOOR_STATUS_OK);
 }
 
-// --MIAMI: Done
 void
 CPed::SetSeekBoatPosition(CVehicle *boat)
 {
@@ -6060,7 +5993,6 @@ CPed::SetSeekBoatPosition(CVehicle *boat)
 	SetPedState(PED_SEEK_IN_BOAT);
 }
 
-// --MIAMI: Done
 void
 CPed::SeekBoatPosition(void)
 {
@@ -6082,7 +6014,6 @@ CPed::SeekBoatPosition(void)
 		RestorePreviousState();
 }
 
-// --MIAMI: Done
 bool
 CPed::IsRoomToBeCarJacked(void)
 {
@@ -6106,7 +6037,6 @@ CPed::IsRoomToBeCarJacked(void)
 	return false;
 }
 
-// --MIAMI: Done
 void
 CPed::AddInCarAnims(CVehicle* car, bool isDriver)
 {
@@ -6141,7 +6071,6 @@ CPed::AddInCarAnims(CVehicle* car, bool isDriver)
 	StopNonPartialAnims();
 }
 
-// --MIAMI: Done
 void
 CPed::RemoveDrivebyAnims()
 {
@@ -6169,7 +6098,6 @@ CPed::RemoveDrivebyAnims()
 		animAssoc->blendDelta = -1000.0f;
 }
 
-// --MIAMI: Done
 void
 CPed::RemoveInCarAnims(void)
 {
@@ -6182,7 +6110,6 @@ CPed::RemoveInCarAnims(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::PositionPedOutOfCollision(void)
 {
@@ -6321,7 +6248,6 @@ CPed::PositionPedOutOfCollision(void)
 	return true;
 }
 
-// --MIAMI: Done
 // "Any" means he shouldn't have to be in vehicle.
 bool
 CPed::PositionAnyPedOutOfCollision(void)
@@ -6377,7 +6303,6 @@ CPed::PositionAnyPedOutOfCollision(void)
 	return true;
 }
 
-// --MIAMI: Done
 bool
 CPed::WarpPedToNearLeaderOffScreen(void)
 {
@@ -6411,7 +6336,6 @@ CPed::WarpPedToNearLeaderOffScreen(void)
 	return teleported;
 }
 
-// --MIAMI: Done
 bool
 CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo)
 {
@@ -6445,7 +6369,6 @@ CPed::WarpPedToNearEntityOffScreen(CEntity *warpTo)
 	return teleported;
 }
 
-// --MIAMI: Done
 int32
 CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWithTarget)
 {
@@ -6720,7 +6643,6 @@ CPed::KillCharOnFootArmed(CVector &ourPos, CVector &targetPos, CVector &distWith
 	return ATTACK_IN_PROGRESS;
 }
 
-// --MIAMI: Done
 int32
 CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWithTarget)
 {
@@ -6975,7 +6897,6 @@ CPed::KillCharOnFootMelee(CVector &ourPos, CVector &targetPos, CVector &distWith
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::CanBeDamagedByThisGangMember(CPed* who)
 {
diff --git a/src/peds/PedAttractor.cpp b/src/peds/PedAttractor.cpp
index eeb65398..22e0e779 100644
--- a/src/peds/PedAttractor.cpp
+++ b/src/peds/PedAttractor.cpp
@@ -13,8 +13,6 @@ const int gcMaxSizeOfPizzaQueue = 5;
 const int gcMaxSizeOfShelterQueue = 5;
 const int gcMaxSizeOfIceCreamQueue = 1;
 
-//--MIAMI: file done
-
 std::vector<CVector> CPedShelterAttractor::ms_displacements;
 
 CPedAttractorManager* GetPedAttractorManager()
diff --git a/src/peds/PedChat.cpp b/src/peds/PedChat.cpp
index 470b7eeb..ec6719c6 100644
--- a/src/peds/PedChat.cpp
+++ b/src/peds/PedChat.cpp
@@ -4,8 +4,6 @@
 #include "General.h"
 #include "Ped.h"
 
-// --MIAMI: file done
-
 // Corresponds to ped sounds (from SOUND_PED_DEATH to SOUND_PED_TAXI_CALL)
 PedAudioData CommentWaitTime[56] = {
   { 500, 800, 500, 2 },
diff --git a/src/peds/PedFight.cpp b/src/peds/PedFight.cpp
index d1f39491..6c691d2d 100644
--- a/src/peds/PedFight.cpp
+++ b/src/peds/PedFight.cpp
@@ -26,8 +26,6 @@
 #include "Glass.h"
 #include "SpecialFX.h"
 
-//--MIAMI: file done
-
 uint16 nPlayerInComboMove;
 RpClump* flyingClumpTemp;
 
@@ -161,7 +159,6 @@ CheckForPedsOnGroundToAttack(CPed *attacker, CPed **pedOnGround)
 	return stateToReturn;
 }
 
-// --MIAMI: Done
 void
 CPed::SetPointGunAt(CEntity *to)
 {
@@ -204,7 +201,6 @@ CPed::SetPointGunAt(CEntity *to)
 		Say(SOUND_PED_ATTACK);
 }
 
-// --MIAMI: Done
 void
 CPed::PointGunAt(void)
 {
@@ -232,7 +228,6 @@ CPed::PointGunAt(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearPointGunAt(void)
 {
@@ -259,7 +254,6 @@ CPed::ClearPointGunAt(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetAttack(CEntity *victim)
 {
@@ -442,7 +436,6 @@ CPed::SetAttack(CEntity *victim)
 	SetLookTimer(100);
 }
 
-// --MIAMI: Done
 void
 CPed::ClearAttack(void)
 {
@@ -463,7 +456,6 @@ CPed::ClearAttack(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearAttackByRemovingAnim(void)
 {
@@ -499,7 +491,6 @@ CPed::ClearAttackByRemovingAnim(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
 {
@@ -579,7 +570,6 @@ CPed::FinishedAttackCB(CAnimBlendAssociation *attackAssoc, void *arg)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
 {
@@ -613,7 +603,6 @@ CPed::FinishedReloadCB(CAnimBlendAssociation *reloadAssoc, void *arg)
 	}
 }
 
-// --MIAMI: Done
 uint8
 CPed::CheckForPointBlankPeds(CPed *pedToVerify)
 {
@@ -657,7 +646,6 @@ CPed::CheckForPointBlankPeds(CPed *pedToVerify)
 	return NO_POINT_BLANK_PED;
 }
 
-// --MIAMI: Done except commented things
 void
 CPed::Attack(void)
 {
@@ -1045,7 +1033,6 @@ CPed::Attack(void)
 	bIsAttacking = attackShouldContinue;
 }
 
-// --MIAMI: Done
 void
 CPed::StartFightAttack(uint8 buttonPressure)
 {
@@ -1135,7 +1122,6 @@ CPed::StartFightAttack(uint8 buttonPressure)
 		nPlayerInComboMove = 0;
 }
 
-// --MIAMI: Done
 void
 CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
 {
@@ -1385,7 +1371,6 @@ CPed::StartFightDefend(uint8 direction, uint8 hitLevel, uint8 unk)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::Fight(void)
 {
@@ -1610,7 +1595,6 @@ CPed::Fight(void)
 	}
 }
 
-// --MIAMI: Done
 int32
 CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon)
 {
@@ -1698,7 +1682,6 @@ CPed::ChooseAttackAI(uint8 buttonPressure, bool fightWithWeapon)
 		return FIGHTMOVE_SHUFFLE_F;
 }
 
-// --MIAMI: Done
 int32
 CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon)
 {
@@ -1947,7 +1930,6 @@ CPed::ChooseAttackPlayer(uint8 buttonPressure, bool fightWithWeapon)
 	return choosenMove;
 }
 
-// --MIAMI: Done
 void
 CPed::EndFight(uint8 endType)
 {
@@ -1982,7 +1964,6 @@ CPed::EndFight(uint8 endType)
 	m_nWaitTimer = 0;
 }
 
-// --MIAMI: Done
 void
 CPed::PlayHitSound(CPed *hitTo)
 {
@@ -2060,7 +2041,6 @@ CPed::PlayHitSound(CPed *hitTo)
 #endif
 }
 
-// --MIAMI: Done
 bool
 CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon)
 {
@@ -2157,7 +2137,6 @@ CPed::FightStrike(CVector &touchedNodePos, bool fightWithWeapon)
 	return false;
 }
 
-// --MIAMI: Done
 void
 CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece)
 {
@@ -2308,7 +2287,6 @@ CPed::FightHitPed(CPed *victim, CVector &touchPoint, CVector &dir, int16 piece)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg)
 {
@@ -2320,7 +2298,6 @@ CPed::FinishFightMoveCB(CAnimBlendAssociation *animAssoc, void *arg)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::LoadFightData(void)
 {
@@ -2408,7 +2385,6 @@ CPed::LoadFightData(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCountDone, uint16 time, float angle)
 {
@@ -2431,7 +2407,6 @@ CPed::SetInvestigateEvent(eEventType event, CVector2D pos, float distanceToCount
 
 }
 
-// --MIAMI: Done
 void
 CPed::InvestigateEvent(void)
 {
@@ -2637,7 +2612,6 @@ CPed::InvestigateEvent(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::ClearInvestigateEvent(void)
 {
@@ -2663,7 +2637,6 @@ CPed::ClearInvestigateEvent(void)
 		SetMoveState(PEDMOVE_WALK);
 }
 
-// --MIAMI: Done
 bool
 CPed::InflictDamage(CEntity *damagedBy, eWeaponType method, float damage, ePedPieceTypes pedPiece, uint8 direction)
 {
@@ -3235,7 +3208,6 @@ RecurseFrameChildrenToCloneCB(RwFrame *frame, void *data)
 	return newFrame;
 }
 
-// --MIAMI: Done
 void
 CPed::RemoveBodyPart(PedNode nodeId, int8 direction)
 {
@@ -3266,7 +3238,6 @@ CPed::RemoveBodyPart(PedNode nodeId, int8 direction)
 	}
 }
 
-// --MIAMI: Done
 CObject*
 CPed::SpawnFlyingComponent(int pedNode, int8 direction)
 {
@@ -3274,7 +3245,6 @@ CPed::SpawnFlyingComponent(int pedNode, int8 direction)
 	return nil;
 }
 
-// --MIAMI: Done
 // III leftover and unused
 void
 CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer)
@@ -3317,14 +3287,12 @@ CPed::ApplyHeadShot(eWeaponType weaponType, CVector pos, bool evenOnPlayer)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPed::IsPedHeadAbovePos(float zOffset)
 {
 	return zOffset + GetPosition().z < GetNodePosition(PED_HEAD).z;
 }
 
-// --MIAMI: Done
 bool
 CPed::PlacePedOnDryLand(void)
 {
@@ -3376,7 +3344,6 @@ CPed::PlacePedOnDryLand(void)
 	return true;
 }
 
-// --MIAMI: Done
 void
 CPed::CollideWithPed(CPed *collideWith)
 {
@@ -3643,7 +3610,6 @@ CPed::CollideWithPed(CPed *collideWith)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::KillPedWithCar(CVehicle *car, float impulse)
 {
@@ -3881,7 +3847,6 @@ CPed::KillPedWithCar(CVehicle *car, float impulse)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::DriveVehicle(void)
 {
@@ -4189,7 +4154,6 @@ CPed::DriveVehicle(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPed::RemoveWeaponAnims(int unused, float animDelta)
 {	
diff --git a/src/peds/PedIK.cpp b/src/peds/PedIK.cpp
index 2925667a..475e04f1 100644
--- a/src/peds/PedIK.cpp
+++ b/src/peds/PedIK.cpp
@@ -7,8 +7,6 @@
 #include "General.h"
 #include "RwHelper.h"
 
-//--MIAMI: file done
-
 LimbMovementInfo CPedIK::ms_torsoInfo = { DEGTORAD(50.0f), DEGTORAD(-50.0f), DEGTORAD(8.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };
 LimbMovementInfo CPedIK::ms_headInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(15.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(8.0f) };
 LimbMovementInfo CPedIK::ms_headRestoreInfo = { DEGTORAD(90.0f), DEGTORAD(-90.0f), DEGTORAD(10.0f), DEGTORAD(45.0f), DEGTORAD(-45.0f), DEGTORAD(5.0f) };
diff --git a/src/peds/PedPlacement.cpp b/src/peds/PedPlacement.cpp
index 8012650a..840d33fc 100644
--- a/src/peds/PedPlacement.cpp
+++ b/src/peds/PedPlacement.cpp
@@ -4,7 +4,6 @@
 #include "PedPlacement.h"
 #include "World.h"
 
-// --MIAMI: Done
 bool
 CPedPlacement::FindZCoorForPed(CVector* pos)
 {
diff --git a/src/peds/PedRoutes.cpp b/src/peds/PedRoutes.cpp
index 2de90eae..3ff080e6 100644
--- a/src/peds/PedRoutes.cpp
+++ b/src/peds/PedRoutes.cpp
@@ -3,8 +3,6 @@
 #include "main.h"
 #include "PedRoutes.h"
 
-// --MIAMI: file done
-
 CRouteNode gaRoutes[NUMPEDROUTES];
 
 void
diff --git a/src/peds/PedType.cpp b/src/peds/PedType.cpp
index bc6395b0..bacb1a78 100644
--- a/src/peds/PedType.cpp
+++ b/src/peds/PedType.cpp
@@ -4,8 +4,6 @@
 #include "FileMgr.h"
 #include "PedType.h"
 
-// --MIAMI: file done
-
 CPedType *CPedType::ms_apPedType[NUM_PEDTYPES];
 CPedStats *CPedStats::ms_apPedStats[NUM_PEDSTATS];
 
diff --git a/src/peds/PlayerPed.cpp b/src/peds/PlayerPed.cpp
index 350b527a..7308b3fb 100644
--- a/src/peds/PlayerPed.cpp
+++ b/src/peds/PlayerPed.cpp
@@ -51,7 +51,6 @@ CPlayerPed::~CPlayerPed()
 	delete m_pWanted;
 }
 
-// --MIAMI: Done
 CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
 {
 	m_fMoveSpeed = 0.0f;
@@ -100,7 +99,6 @@ CPlayerPed::CPlayerPed(void) : CPed(PEDTYPE_PLAYER1)
 	idleAnimBlockIndex = CAnimManager::GetAnimationBlockIndex("playidles");
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::ClearWeaponTarget()
 {
@@ -112,21 +110,18 @@ CPlayerPed::ClearWeaponTarget()
  	ClearPointGunAt();
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::SetWantedLevel(int32 level)
 {
 	m_pWanted->SetWantedLevel(level);
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::SetWantedLevelNoDrop(int32 level)
 {
 	m_pWanted->SetWantedLevelNoDrop(level);
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::MakeObjectTargettable(int32 handle)
 {
@@ -138,7 +133,6 @@ CPlayerPed::MakeObjectTargettable(int32 handle)
 	}
 }
 
-// --MIAMI: Done
 // I don't know the actual purpose of parameter
 void
 CPlayerPed::AnnoyPlayerPed(bool annoyedByPassingEntity)
@@ -152,7 +146,6 @@ CPlayerPed::AnnoyPlayerPed(bool annoyedByPassingEntity)
 	}
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::ClearAdrenaline(void)
 {
@@ -162,7 +155,6 @@ CPlayerPed::ClearAdrenaline(void)
 	}
 }
 
-// --MIAMI: Done
 CPlayerInfo *
 CPlayerPed::GetPlayerInfoForThisPlayerPed()
 {
@@ -172,7 +164,6 @@ CPlayerPed::GetPlayerInfoForThisPlayerPed()
 	return nil;
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::SetupPlayerPed(int32 index)
 {
@@ -193,21 +184,18 @@ CPlayerPed::SetupPlayerPed(int32 index)
 #endif
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::DeactivatePlayerPed(int32 index)
 {
 	CWorld::Remove(CWorld::Players[index].m_pPed);
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::ReactivatePlayerPed(int32 index)
 {
 	CWorld::Add(CWorld::Players[index].m_pPed);
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::UseSprintEnergy(void)
 {
@@ -224,7 +212,6 @@ CPlayerPed::UseSprintEnergy(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::MakeChangesForNewWeapon(eWeaponType weapon)
 {
@@ -249,7 +236,6 @@ CPlayerPed::MakeChangesForNewWeapon(eWeaponType weapon)
 	TheCamera.ClearPlayerWeaponMode();
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::MakeChangesForNewWeapon(int32 slot)
 {
@@ -257,7 +243,6 @@ CPlayerPed::MakeChangesForNewWeapon(int32 slot)
 		MakeChangesForNewWeapon(m_weapons[slot].m_eWeaponType);
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::ReApplyMoveAnims(void)
 {
@@ -277,7 +262,6 @@ CPlayerPed::ReApplyMoveAnims(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::SetInitialState(void)
 {
@@ -324,7 +308,6 @@ CPlayerPed::SetInitialState(void)
 	m_attachWepAmmo = 0;
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::SetRealMoveAnim(void)
 {
@@ -568,7 +551,6 @@ CPlayerPed::SetRealMoveAnim(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::RestoreSprintEnergy(float restoreSpeed)
 {
@@ -576,7 +558,6 @@ CPlayerPed::RestoreSprintEnergy(float restoreSpeed)
 		m_fCurrentStamina += restoreSpeed * CTimer::GetTimeStep() * 0.5f;
 }
 
-// --MIAMI: Done
 float
 CPlayerPed::DoWeaponSmoothSpray(void)
 {
@@ -626,7 +607,6 @@ CPlayerPed::DoWeaponSmoothSpray(void)
 		return -1.0f;
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::DoStuffToGoOnFire(void)
 {
@@ -634,7 +614,6 @@ CPlayerPed::DoStuffToGoOnFire(void)
 		TheCamera.ClearPlayerWeaponMode();
 }
 
-// --MIAMI: Done
 bool
 CPlayerPed::DoesTargetHaveToBeBroken(CVector target, CWeapon *weaponUsed)
 {
@@ -646,7 +625,6 @@ CPlayerPed::DoesTargetHaveToBeBroken(CVector target, CWeapon *weaponUsed)
 	return false;
 }
 
-// --MIAMI: Done
 // Cancels landing anim while running & jumping? I think
 void
 CPlayerPed::RunningLand(CPad *padUsed)
@@ -665,7 +643,6 @@ CPlayerPed::RunningLand(CPad *padUsed)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPlayerPed::IsThisPedAnAimingPriority(CPed *suspect)
 {
@@ -688,7 +665,6 @@ CPlayerPed::IsThisPedAnAimingPriority(CPed *suspect)
 	return suspect->m_nPedState == PED_ABSEIL;
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::PlayerControlSniper(CPad *padUsed)
 {
@@ -725,7 +701,6 @@ CPlayerPed::PlayerControlSniper(CPad *padUsed)
 	GetWeapon()->Update(m_audioEntityId, nil);
 }
 
-// --MIAMI: Done
 // I think R* also used goto in here.
 void
 CPlayerPed::ProcessWeaponSwitch(CPad *padUsed)
@@ -816,7 +791,6 @@ switchDetectDone:
 	}
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::PlayerControlM16(CPad *padUsed)
 {
@@ -853,7 +827,6 @@ CPlayerPed::PlayerControlM16(CPad *padUsed)
 	GetWeapon()->Update(m_audioEntityId, nil);
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::PlayerControlFighter(CPad *padUsed)
 {
@@ -879,7 +852,6 @@ CPlayerPed::PlayerControlFighter(CPad *padUsed)
 	}
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::PlayerControl1stPersonRunAround(CPad *padUsed)
 {
@@ -940,7 +912,6 @@ CPlayerPed::PlayerControl1stPersonRunAround(CPad *padUsed)
 #endif
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::KeepAreaAroundPlayerClear(void)
 {
@@ -990,7 +961,6 @@ CPlayerPed::KeepAreaAroundPlayerClear(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::EvaluateNeighbouringTarget(CEntity *candidate, CEntity **targetPtr, float *lastCloseness, float distLimit, float angleOffset, bool lookToLeft, bool priority)
 {
@@ -1017,7 +987,6 @@ CPlayerPed::EvaluateNeighbouringTarget(CEntity *candidate, CEntity **targetPtr,
 	}
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::EvaluateTarget(CEntity *candidate, CEntity **targetPtr, float *lastCloseness, float distLimit, float angleOffset, bool priority)
 {
@@ -1072,7 +1041,6 @@ CPlayerPed::RotatePlayerToTrackTarget(void)
 	}
 }
 
-// --MIAMI: Done
 bool
 CPlayerPed::FindNextWeaponLockOnTarget(CEntity *previousTarget, bool lookToLeft)
 {
@@ -1115,7 +1083,6 @@ CPlayerPed::FindNextWeaponLockOnTarget(CEntity *previousTarget, bool lookToLeft)
 	return true;
 }
 
-// --MIAMI: Done
 bool
 CPlayerPed::FindWeaponLockOnTarget(void)
 {
@@ -1167,7 +1134,6 @@ CPlayerPed::FindWeaponLockOnTarget(void)
 	return true;
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::ProcessAnimGroups(void)
 {
@@ -1477,7 +1443,6 @@ CPlayerPed::MovementDisabledBecauseOfTargeting(void)
 	return m_pPointGunAt && !CWeaponInfo::GetWeaponInfo(GetWeapon()->m_eWeaponType)->IsFlagSet(WEAPONFLAG_CANAIM_WITHARM);
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::PlayerControlZelda(CPad *padUsed)
 {
@@ -1655,7 +1620,7 @@ CPlayerPed::ProcessControl(void)
 	if (m_nEvadeAmount == 0)
 		m_pEvadingFrom = nil;
 
-	if (m_pWanted->m_nWantedLevel > 0)
+	if (m_pWanted->GetWantedLevel() > 0)
 		FindNewAttackPoints();
 	
 	UpdateMeleeAttackers();
@@ -1953,7 +1918,6 @@ CPlayerPed::ProcessControl(void)
 		UpdateRpHAnim();
 }
 
-// --MIAMI: Done
 bool
 CPlayerPed::DoesPlayerWantNewWeapon(eWeaponType weapon, bool onlyIfSlotIsEmpty)
 {
@@ -2037,7 +2001,6 @@ CPlayerPed::PlayIdleAnimations(CPad *padUsed)
 	}
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::SetNearbyPedsToInteractWithPlayer(void)
 {
@@ -2072,7 +2035,6 @@ CPlayerPed::SetNearbyPedsToInteractWithPlayer(void)
 	}
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::UpdateMeleeAttackers(void)
 {
@@ -2115,7 +2077,6 @@ CPlayerPed::UpdateMeleeAttackers(void)
 		&& m_pMeleeList[4] == this && m_pMeleeList[5] == this;
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::RemovePedFromMeleeList(CPed *ped)
 {
@@ -2128,7 +2089,6 @@ CPlayerPed::RemovePedFromMeleeList(CPed *ped)
 	ped->m_attackTimer = 0;
 }
 
-// --MIAMI: Done
 void
 CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist)
 {
@@ -2161,7 +2121,6 @@ CPlayerPed::GetMeleeAttackCoords(CVector& coords, int8 dir, float dist)
 	}
 }
 
-// --MIAMI: Done
 int32
 CPlayerPed::FindMeleeAttackPoint(CPed *victim, CVector &dist, uint32 &endOfAttackOut)
 {
diff --git a/src/peds/Population.cpp b/src/peds/Population.cpp
index 4284def5..0119b475 100644
--- a/src/peds/Population.cpp
+++ b/src/peds/Population.cpp
@@ -29,8 +29,6 @@
 #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.
 #define OFFSCREEN_CREATION_MULT	0.5f
@@ -537,7 +535,7 @@ CPopulation::AddToPopulation(float minDist, float maxDist, float minDistOffScree
 	CTheZones::GetZoneInfoForTimeOfDay(&playerCentreOfWorld, &zoneInfo);
 	CWanted *wantedInfo = playerInfo->m_pPed->m_pWanted;
 
-	if (wantedInfo->m_nWantedLevel > 2) {
+	if (wantedInfo->GetWantedLevel() > 2) {
 		if (!CGame::IsInInterior() && (CGeneral::GetRandomNumber() % 32 == 0) && FindPlayerVehicle())
 			forceAddingCop = true;