diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h
index 58aba733..182a0cea 100644
--- a/src/modelinfo/ModelIndices.h
+++ b/src/modelinfo/ModelIndices.h
@@ -233,7 +233,7 @@ enum
 	MI_JFOTO,
 	MI_JMOTO,
 
-	MI_CBA = 83,
+	MI_CBA,// = 83,
 	MI_CBB,
 	MI_HNA,
 	MI_HNB,
@@ -255,12 +255,30 @@ enum
 	MI_VICE6,
 	MI_VICE7,
 	MI_VICE8,
-	MI_WFYG2 = 106,	// last regular ped
+	MI_WFYG1,
+	MI_WFYG2,// = 106,	// last regular ped
+	// three more peds possible
 	MI_SPECIAL01 = 109,
-	MI_SPECIAL02 = 110,
-	MI_SPECIAL03 = 111,
-	MI_SPECIAL04 = 112,
-	MI_SPECIAL21 = 129,
+	MI_SPECIAL02,
+	MI_SPECIAL03,
+	MI_SPECIAL04,
+	MI_SPECIAL05,
+	MI_SPECIAL06,
+	MI_SPECIAL07,
+	MI_SPECIAL08,
+	MI_SPECIAL09,
+	MI_SPECIAL10,
+	MI_SPECIAL11,
+	MI_SPECIAL12,
+	MI_SPECIAL13,
+	MI_SPECIAL14,
+	MI_SPECIAL15,
+	MI_SPECIAL16,
+	MI_SPECIAL17,
+	MI_SPECIAL18,
+	MI_SPECIAL19,
+	MI_SPECIAL20,
+	MI_SPECIAL21,// = 129,
 
 	MI_LAST_PED = MI_SPECIAL21,
 	MI_FIRST_VEHICLE,
@@ -372,10 +390,18 @@ enum
 	MI_BLOODRA,
 	MI_BLOODRB,
 	MI_VICECHEE,
-	// 3 available vehicle slots in here
-	MI_LAST_VEHICLE = 239,
 
-	MI_CAR_DOOR = 240,
+	// HACK
+	MI_TRAIN = -1,
+	MI_DODO = -2,
+
+	MI_LAST_VEHICLE = MI_VICECHEE,
+
+	MI_WHEEL_RIM,
+	MI_WHEEL_OFFROAD,
+	MI_WHEEL_TRUCK,
+
+	MI_CAR_DOOR,// = 240,
 	MI_CAR_BUMPER,
 	MI_CAR_PANEL,
 	MI_CAR_BONNET,
@@ -384,11 +410,18 @@ enum
 	MI_BODYPARTA,
 	MI_BODYPARTB,
 
-	// HACK
-	MI_TRAIN = -1,
-	MI_DODO = -2,
+	MI_WHEEL_SPORT = 250,
+	MI_WHEEL_SALOON,
+	MI_WHEEL_LIGHTVAN,
+	MI_WHEEL_CLASSIC,
+	MI_WHEEL_ALLOY,
+	MI_WHEEL_LIGHTTRUCK,
+	MI_WHEEL_SMALLCAR,
 
-	MI_BRASS_KNUCKLES = 259,
+	MI_AIRTRAIN_VLO, // = 257,
+	MI_MOBILE,
+
+	MI_BRASS_KNUCKLES, // 259
 	MI_SCREWDRIVER,
 	MI_GOLFCLUB,
 	MI_NIGHTSTICK,
@@ -425,20 +458,18 @@ enum
 	MI_FINGERS,
 	MI_MINIGUN2,
 
-	MI_CUTOBJ01 = 295,
+	MI_CUTOBJ01,// = 295,
 	MI_CUTOBJ02,
 	MI_CUTOBJ03,
 	MI_CUTOBJ04,
 	MI_CUTOBJ05,
 
-	MI_AIRTRAIN_VLO = 257,
-	MI_MOBILE = 258,
 
-	NUM_DEFAULT_MODELS = 300
+	NUM_DEFAULT_MODELS,// = 300
 };
 
 enum{
-	NUM_OF_SPECIAL_CHARS = 4,
+	NUM_OF_SPECIAL_CHARS = 21,
 	NUM_OF_CUTSCENE_OBJECTS = 5
 };
 
diff --git a/src/peds/CivilianPed.cpp b/src/peds/CivilianPed.cpp
index 74a7c9ba..18a0e2a3 100644
--- a/src/peds/CivilianPed.cpp
+++ b/src/peds/CivilianPed.cpp
@@ -34,7 +34,11 @@ CCivilianPed::CCivilianPed(ePedType pedtype, uint32 mi) : CPed(pedtype)
 	m_bJustStoleACar = false;
 	m_bStealCarEvenIfThereIsSomeoneInIt = false;
 	for (int i = 0; i < ARRAY_SIZE(m_nStealWishList); i++) {
-		uint32 randomCarModel = CGeneral::GetRandomNumberInRange(MI_LANDSTAL, MI_LAST_VEHICLE + 1);
+#ifdef FIX_BUGS
+		uint32 randomCarModel = CGeneral::GetRandomNumberInRange(MI_LANDSTAL, MI_LAST_VEHICLE);
+#else
+		uint32 randomCarModel = CGeneral::GetRandomNumberInRange(MI_LANDSTAL, MI_LANDSTAL + VEHICLEMODELSIZE);
+#endif
 		if (CModelInfo::IsCarModel(randomCarModel) || CModelInfo::IsBikeModel(randomCarModel))
 			m_nStealWishList[i] = randomCarModel;
 		else