diff --git a/gamemodes/sf-cnr.pwn b/gamemodes/sf-cnr.pwn
index 5a3538a..c298462 100644
--- a/gamemodes/sf-cnr.pwn
+++ b/gamemodes/sf-cnr.pwn
@@ -13,7 +13,7 @@
 */
 
 #pragma compat 1
-// #pragma option -d3
+#pragma option -d3
 #pragma dynamic 7200000
 // #define DEBUG_MODE
 
@@ -233,7 +233,7 @@ new stock
 #define CLASS_MEDIC              	( 3 )
 
 /* ** Checkpoints ** */
-#define ALL_CHECKPOINTS             ( 46 )
+#define ALL_CHECKPOINTS             ( 49 )
 
 #define CP_BOMB_SHOP                ( 0 )
 #define CP_BANK_MENU                ( 1 )
@@ -281,6 +281,9 @@ new stock
 #define CP_REWARDS_4DRAG 	 		( 43 )
 #define CP_REWARDS_CALIG 	 		( 44 )
 #define CP_REWARDS_VISAGE 			( 45 )
+#define CP_AIRPORT_SF 				( 46 )
+#define CP_AIRPORT_LS 				( 47 )
+#define CP_AIRPORT_LV 				( 48 )
 
 /* ** Discord ** */
 //#include <discord-connector>
@@ -2701,6 +2704,7 @@ static const
 	}
 ;
 
+
 new
 	g_slotmachineData				[ MAX_MACHINES ] [ E_SLOT_MACHINE_DATA ],
 	g_slotmachineColors				[ ] [ ] = {
@@ -3268,7 +3272,8 @@ new
 	bool: p_AutoSpin				[ MAX_PLAYERS char ],
 	p_InBusiness 					[ MAX_PLAYERS ] = { -1, ... },
 	p_VehicleBringCooldown 			[ MAX_PLAYERS ],
-	p_BusinessSpawnLocation 		[ MAX_PLAYERS ] = { -1, ... }
+	p_BusinessSpawnLocation 		[ MAX_PLAYERS ] = { -1, ... },
+	p_Fireworks 					[ MAX_PLAYERS ]
 ;
 
 /* ** Server Data ** */
@@ -3520,8 +3525,6 @@ public OnGameModeInit()
 	CreateRobberyCheckpoint( "Bank of San Fierro - Safe 2", 5000, -1400.84180, 861.17932, 985.07251, -90.00000, g_bankvaultData[ CITY_SF ] [ E_WORLD ] );
 	CreateRobberyCheckpoint( "Bank of San Fierro - Safe 3", 5000, -1400.84180, 856.08679, 985.07251, -90.00000, g_bankvaultData[ CITY_SF ] [ E_WORLD ] );
 	CreateRobberyCheckpoint( "Bank of San Fierro - Safe 4", 5000, -1400.84180, 858.61407, 984.17200, -90.00000, g_bankvaultData[ CITY_SF ] [ E_WORLD ] );
-	CreateRobberyCheckpoint( "San Fierro Airport - Safe 1", 4000, -1894.15894, -17.17650, 1060.88428, 90.00000, -1 );
-	CreateRobberyCheckpoint( "San Fierro Airport - Safe 2", 4000, -1894.15808, -19.11643, 1060.88428, 90.00000, -1 );
 
 	CreateRobberyCheckpoint( "Desperado Cafe", 1500, 2113.085693, -1784.566406, 12.950445, 180.000000, -1 );
 	CreateRobberyCheckpoint( "Ahmyy's Cafe", 3000, 2540.558593, 2013.840209, 10.289649, 90.000000, -1 );
@@ -3744,7 +3747,6 @@ public OnGameModeInit()
 	CreateEntrance( "[SUBURBAN]", 			-2489.9392, -29.0578, 25.6172, 203.8414, -50.6566, 1001.8047, 			1,  21, false, false, 45 );
 	CreateEntrance( "[TATTOO]", 			-2490.9966, -38.7627, 25.6172, -204.4172,-27.3470,1002.2734, 			16, 22, false, false, 39 );
 	CreateEntrance( "[CHURCH]", 			-1989.7933, 1117.9083, 54.4688, 1964.0679, -349.6309, 1092.9454, 		1,   1, true , false, -1 );
-	CreateEntrance( "[AIRPORT]", 			-1422.4063, -286.5081, 14.1484, -1796.6152, 56.8790, 1061.4613, 		14, 24, true , false,  5 );
 	CreateEntrance( "[CITY HALL]", 			-2766.4087, 375.5447, 6.3347, 390.7462, 173.7627, 1008.3828, 			3,   1, false, false, -1 );
 	CreateEntrance( "[DRUG HOUSE]", 		-2027.8260, -40.6628, 38.8047, 2196.8398, -1204.4272, 1049.0234, 		6,  26, false, false, 24 );
 	CreateEntrance( "[DRUG HOUSE]", 		-2552.3325,55.2304,16.4219, 2196.8398, -1204.4272, 1049.0234, 			6,  27, false, false, 24 );
@@ -4942,11 +4944,11 @@ public OnServerUpdate( )
 				iRandom = random( 3 );
 
 			if ( iRandom == 2 )
-				SendClientMessageToAllFormatted( -1, "{8ADE47}Stephanie:"COL_WHITE" The Visage Casino has a prize pool of "COL_GREY"%s"COL_WHITE", use a slot machine to try win!", ConvertPrice( g_casinoPoolData[ 2 ] [ E_POOL ] ) );
+				SendClientMessageToAllFormatted( -1, "{8ADE47}Stephanie:"COL_WHITE" The Visage Casino has a prize pool of "COL_GREY"%s"COL_WHITE", use a slot machine to try win!", number_format( g_casinoPoolData[ 2 ] [ E_POOL ] ) );
 			else if ( iRandom == 1 )
-				SendClientMessageToAllFormatted( -1, "{8ADE47}Stephanie:"COL_WHITE" Caligulas Casino has a prize pool of "COL_GREY"%s"COL_WHITE", use a slot machine to try win!", ConvertPrice( g_casinoPoolData[ 1 ] [ E_POOL ] ) );
+				SendClientMessageToAllFormatted( -1, "{8ADE47}Stephanie:"COL_WHITE" Caligulas Casino has a prize pool of "COL_GREY"%s"COL_WHITE", use a slot machine to try win!", number_format( g_casinoPoolData[ 1 ] [ E_POOL ] ) );
 			else
-				SendClientMessageToAllFormatted( -1, "{8ADE47}Stephanie:"COL_WHITE" Caligulas Casino has a prize pool of "COL_GREY"%s"COL_WHITE", use a slot machine to try win!", ConvertPrice( g_casinoPoolData[ 0 ] [ E_POOL ] ) );
+				SendClientMessageToAllFormatted( -1, "{8ADE47}Stephanie:"COL_WHITE" Caligulas Casino has a prize pool of "COL_GREY"%s"COL_WHITE", use a slot machine to try win!", number_format( g_casinoPoolData[ 0 ] [ E_POOL ] ) );
 		}
 		else
 		{
@@ -5072,12 +5074,15 @@ public OnServerUpdate( )
 
 			if ( FCNPC_IsValid( npcid ) && p_Class[ playerid ] != CLASS_POLICE )
 			{
-				new
-					clerkid = GetRobberyNpcFromPlayer( npcid );
+				new clerkid = GetRobberyNpcFromPlayer( npcid );
 
 				if ( clerkid != -1 )
 				{
-					if ( g_robberyNpcData[ clerkid ] [ E_TIMEOUT ] < g_iTime && g_robberyNpcData[ clerkid ] [ E_HOLDUP_TIMER ] == -1 && g_robberyNpcData[ clerkid ] [ E_LOOT ] && ! g_robberyNpcData[ clerkid ] [ E_PROVOKED ] )
+					new weaponid = GetPlayerWeapon( playerid );
+					new Float: distance = GetDistanceBetweenPlayers( playerid, npcid );
+					new is_melee = ( weaponid == 0 || weaponid == 1 || weaponid == 7 || 10 <= weaponid <= 18 );
+
+					if ( g_robberyNpcData[ clerkid ] [ E_TIMEOUT ] < g_iTime && g_robberyNpcData[ clerkid ] [ E_HOLDUP_TIMER ] == -1 && g_robberyNpcData[ clerkid ] [ E_LOOT ] && ! g_robberyNpcData[ clerkid ] [ E_PROVOKED ] && distance < 10.0 && ! is_melee )
 					{
 						GivePlayerWantedLevel( playerid, 6 );
 						PlayerTextDrawSetString( playerid, p_RobberyRiskTD[ playerid ], "~y~~h~Clerk is confused" );
@@ -5246,7 +5251,7 @@ public OnServerUpdate( )
 							    case 2:
 							    {
 							    	GivePlayerCash( playerid, ( iMoney = RandomEx( 600000, 1500000 ) ) );
-							    	format( szPrize, sizeof( szPrize ), "%s", ConvertPrice( iMoney ) );
+							    	format( szPrize, sizeof( szPrize ), "%s", number_format( iMoney ) );
 							    }
 							    case 3:
 							    {
@@ -5619,7 +5624,7 @@ public ZoneTimer( )
 				g_gangData[ g ] [ E_BANK ] += iCaptured;
 
 		    	if ( iCaptured )
-		    		SaveGangData( g ), SendClientMessageToGang( g, g_gangData[ g ] [ E_COLOR ], "[GANG] "COL_GOLD"%s"COL_WHITE" has been earned from territories and deposited in the gang bank account.", ConvertPrice( iCaptured ) );
+		    		SaveGangData( g ), SendClientMessageToGang( g, g_gangData[ g ] [ E_COLOR ], "[GANG] "COL_GOLD"%s"COL_WHITE" has been earned from territories and deposited in the gang bank account.", number_format( iCaptured ) );
     		}
     	}
 
@@ -6425,6 +6430,7 @@ public OnPlayerDisconnect( playerid, reason )
 	p_JailsBlown	[ playerid ] = 0;
 	p_AccountID		[ playerid ] = 0;
 	p_DeathMessage	[ playerid ] [ 0 ] = '\0';
+	p_Fireworks 	[ playerid ] = 0;
 	p_TicketTimestamp[ playerid ] = 0;
 	p_ExtraAssetSlots{ playerid } = 0;
 	p_HitmarkerSound{ playerid } = 0;
@@ -7381,7 +7387,7 @@ public OnPlayerDeath( playerid, killerid, reason )
 		new
 			szTaxable[ 128 ], iMoney = p_inPaintBall{ playerid } == true ? 0 : ( GetPlayerTotalCash( playerid ) > 200000 ? 1500 : 100 );
 
-		format( szTaxable, sizeof( szTaxable ), "~w~You have paid ~r~%s~w~ in medical fees", ConvertPrice( iMoney ) );
+		format( szTaxable, sizeof( szTaxable ), "~w~You have paid ~r~%s~w~ in medical fees", number_format( iMoney ) );
 		GivePlayerCash( playerid, -( iMoney ) );
 
 		if ( p_TaxTime{ playerid } == true )
@@ -7389,8 +7395,8 @@ public OnPlayerDeath( playerid, killerid, reason )
 		    new iTax = p_inPaintBall{ playerid } == true ? 0 : getPlayerTax( playerid );
 			GivePlayerCash( playerid, -iTax );
 			UpdateServerVariable( "eventbank", GetGVarInt( "eventbank" ) + floatround( iTax * 0.10 ), 0.0, "", GLOBAL_VARTYPE_INT );
-			if ( strlen( szTaxable ) ) format( szTaxable, sizeof( szTaxable ), "%s and ~r~%s~w~ in tax", szTaxable, ConvertPrice( iTax ) );
-			else format( szTaxable, sizeof( szTaxable ), "~w~You have paid ~r~%s~w~ in tax", ConvertPrice( iTax ) );
+			if ( strlen( szTaxable ) ) format( szTaxable, sizeof( szTaxable ), "%s and ~r~%s~w~ in tax", szTaxable, number_format( iTax ) );
+			else format( szTaxable, sizeof( szTaxable ), "~w~You have paid ~r~%s~w~ in tax", number_format( iTax ) );
 			p_TaxTime{ playerid } = false;
 		}
 		ShowPlayerHelpDialog( playerid, 5000, szTaxable );
@@ -7500,9 +7506,9 @@ public OnPlayerDeath( playerid, killerid, reason )
 					        new cashEarned = ( p_WantedLevel[ playerid ] < MAX_WANTED_LVL ? p_WantedLevel[ playerid ] : MAX_WANTED_LVL ) * ( reason == 38 ? 170 : 270 );
 					        GivePlayerCash( killerid, cashEarned );
 					        GivePlayerScore( killerid, 2 );
-					        if ( cashEarned > 20000 ) printf("[police kill] %s -> %s - %s", ReturnPlayerName( killerid ), ReturnPlayerName( playerid ), ConvertPrice( cashEarned ) ); // 8hska7082bmahu
+					        if ( cashEarned > 20000 ) printf("[police kill] %s -> %s - %s", ReturnPlayerName( killerid ), ReturnPlayerName( playerid ), number_format( cashEarned ) ); // 8hska7082bmahu
 					       	if ( p_WantedLevel[ playerid ] > 64 ) SendGlobalMessage( -1, ""COL_GOLD"[POLICE KILL]{FFFFFF} %s(%d) has %s %s(%d) who had a wanted level of %d!", ReturnPlayerName( killerid ), killerid, killedWords[ random( sizeof( killedWords ) ) ], ReturnPlayerName( playerid ), playerid, p_WantedLevel[ playerid ] );
-					    	SendClientMessageFormatted( killerid, -1, ""COL_GOLD"[ACHIEVE]{FFFFFF} You have killed %s(%d) with a wanted level of %d; earning you "COL_GOLD"%s{FFFFFF} and 2 score!", ReturnPlayerName( playerid ), playerid, p_WantedLevel[ playerid ], ConvertPrice( cashEarned ) );
+					    	SendClientMessageFormatted( killerid, -1, ""COL_GOLD"[ACHIEVE]{FFFFFF} You have killed %s(%d) with a wanted level of %d; earning you "COL_GOLD"%s{FFFFFF} and 2 score!", ReturnPlayerName( playerid ), playerid, p_WantedLevel[ playerid ], number_format( cashEarned ) );
 					    }
 					    else
 					    {
@@ -7552,7 +7558,7 @@ public OnPlayerDeath( playerid, killerid, reason )
 			}
 			else
 			{
-			    SendGlobalMessage( -1, ""COL_ORANGE"[CONTRACT]"COL_WHITE" %s(%d) has completed the contract on %s(%d), he has earned "COL_GOLD"%s"COL_WHITE".", ReturnPlayerName( killerid ), killerid, ReturnPlayerName( playerid ), playerid, ConvertPrice( iContractAmount ) );
+			    SendGlobalMessage( -1, ""COL_ORANGE"[CONTRACT]"COL_WHITE" %s(%d) has completed the contract on %s(%d), he has earned "COL_GOLD"%s"COL_WHITE".", ReturnPlayerName( killerid ), killerid, ReturnPlayerName( playerid ), playerid, number_format( iContractAmount ) );
 				GivePlayerCash( killerid, iContractAmount );
 				p_ContractedAmount[ playerid ] = 0;
 			   	switch( ++p_HitsComplete[ killerid ] )
@@ -7620,18 +7626,18 @@ public OnVehicleDeath( vehicleid, killerid )
 				GivePlayerScore( attackerid, 2 );
 				GivePlayerCash( attackerid, payout );
 				if ( p_Class[ attackerid ] != CLASS_POLICE ) GivePlayerWantedLevel( attackerid, 6 );
-				SendGlobalMessage( -1, ""COL_GREY"[BUSINESS]"COL_WHITE" %s(%d) has destroyed a business vehicle and earned "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( attackerid ), attackerid, ConvertPrice( payout ) );
+				SendGlobalMessage( -1, ""COL_GREY"[BUSINESS]"COL_WHITE" %s(%d) has destroyed a business vehicle and earned "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( attackerid ), attackerid, number_format( payout ) );
 			}
 			else
 			{
 				if ( IsPlayerConnected( killerid ) ) {
-					if ( IsBusinessAssociate( killerid, businessid ) ) SendGlobalMessage( -1, ""COL_GREY"[BUSINESS]"COL_WHITE" %s(%d)'s business vehicle with "COL_GOLD"%s"COL_WHITE" in inventory got destroyed!", ReturnPlayerName( killerid ), killerid, ConvertPrice( g_businessData[ businessid ] [ E_EXPORT_VALUE ] * ( MAX_DROPS - g_businessData[ businessid ] [ E_EXPORTED_AMOUNT ] ) ) );
+					if ( IsBusinessAssociate( killerid, businessid ) ) SendGlobalMessage( -1, ""COL_GREY"[BUSINESS]"COL_WHITE" %s(%d)'s business vehicle with "COL_GOLD"%s"COL_WHITE" in inventory got destroyed!", ReturnPlayerName( killerid ), killerid, number_format( g_businessData[ businessid ] [ E_EXPORT_VALUE ] * ( MAX_DROPS - g_businessData[ businessid ] [ E_EXPORTED_AMOUNT ] ) ) );
 					else
 					{
 						GivePlayerScore( killerid, 2 );
 						GivePlayerCash( killerid, payout );
 						if ( p_Class[ killerid ] != CLASS_POLICE ) GivePlayerWantedLevel( killerid, 6 );
-						SendGlobalMessage( -1, ""COL_GREY"[BUSINESS]"COL_WHITE" %s(%d) has destroyed a business vehicle and earned "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( killerid ), killerid, ConvertPrice( payout ) );
+						SendGlobalMessage( -1, ""COL_GREY"[BUSINESS]"COL_WHITE" %s(%d) has destroyed a business vehicle and earned "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( killerid ), killerid, number_format( payout ) );
 					}
 				}
 			}
@@ -8185,7 +8191,7 @@ public OnPlayerProgressComplete( playerid, progressid, params )
 						    GetZoneFromCoordinates( szLocation, g_entranceData[ id ] [ E_EX ], g_entranceData[ id ] [ E_EY ], g_entranceData[ id ] [ E_EZ ] );
 						    if ( !strmatch( szCity, "San Fierro" ) && !strmatch( szCity, "Las Venturas" ) && !strmatch( szCity, "Los Santos" ) ) g_robberyData[ robberyid ] [ E_SAFE_LOOT ] /= 2; // Halve Profit outside SF, LV & LS
 							//if ( strmatch( szCity, "Las Venturas" ) || strmatch( szCity, "Los Santos" ) ) g_robberyData[ robberyid ] [ E_SAFE_LOOT ] = floatround( g_robberyData[ robberyid ] [ E_SAFE_LOOT ] * 0.75 ); // Remove 25%
-							SendGlobalMessage( -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" %s(%d) has robbed "COL_GOLD"%s"COL_WHITE" from %s near %s in %s!", ReturnPlayerName( playerid ), playerid, ConvertPrice( g_robberyData[ robberyid ] [ E_SAFE_LOOT ] ), g_robberyData[ robberyid ] [ E_NAME ], szLocation, szCity );
+							SendGlobalMessage( -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" %s(%d) has robbed "COL_GOLD"%s"COL_WHITE" from %s near %s in %s!", ReturnPlayerName( playerid ), playerid, number_format( g_robberyData[ robberyid ] [ E_SAFE_LOOT ] ), g_robberyData[ robberyid ] [ E_NAME ], szLocation, szCity );
 						}
 						else
 						{
@@ -8193,7 +8199,7 @@ public OnPlayerProgressComplete( playerid, progressid, params )
 						    Get2DCity( szCity, X, Y, Z );
 						    if ( !strmatch( szCity, "San Fierro" ) && !strmatch( szCity, "Las Venturas" ) && !strmatch( szCity, "Los Santos" ) ) g_robberyData[ robberyid ] [ E_SAFE_LOOT ] /= 2; // Halve Profit outside SF, LV & LS
 							//if ( strmatch( szCity, "Las Venturas" ) || strmatch( szCity, "Los Santos" ) ) g_robberyData[ robberyid ] [ E_SAFE_LOOT ] = floatround( g_robberyData[ robberyid ] [ E_SAFE_LOOT ] * 0.75 ); // Remove 25%
-							SendGlobalMessage( -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" %s(%d) has robbed "COL_GOLD"%s"COL_WHITE" from %s in %s!", ReturnPlayerName( playerid ), playerid, ConvertPrice( g_robberyData[ robberyid ] [ E_SAFE_LOOT ] ), g_robberyData[ robberyid ] [ E_NAME ], szCity );
+							SendGlobalMessage( -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" %s(%d) has robbed "COL_GOLD"%s"COL_WHITE" from %s in %s!", ReturnPlayerName( playerid ), playerid, number_format( g_robberyData[ robberyid ] [ E_SAFE_LOOT ] ), g_robberyData[ robberyid ] [ E_NAME ], szCity );
 						}
 
 						GivePlayerScore( playerid, 2 );
@@ -8365,7 +8371,7 @@ public OnPlayerProgressComplete( playerid, progressid, params )
 						Achievement::HandlePlayerRobbery( playerid );
 					    SplitPlayerCashForGang( playerid, float( g_secureTruckData[ E_LOOT ] ) );
 
-						SendGlobalMessage( -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" %s(%d) has robbed "COL_GOLD"%s"COL_WHITE" from a Security Truck near %s in %s!", ReturnPlayerName( playerid ), playerid, ConvertPrice( g_secureTruckData[ E_LOOT ] ), szLocation, szCity );
+						SendGlobalMessage( -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" %s(%d) has robbed "COL_GOLD"%s"COL_WHITE" from a Security Truck near %s in %s!", ReturnPlayerName( playerid ), playerid, number_format( g_secureTruckData[ E_LOOT ] ), szLocation, szCity );
 					} else {
 						CreateCrimeReport( playerid );
 		    			SendClientMessageToCops( -1, ""COL_BLUE"[ROBBERY]"COL_WHITE" %s has failed robbing a security truck near %s, suspect is armed and dangerous.", ReturnPlayerName( playerid ), szLocation );
@@ -8594,7 +8600,7 @@ CMD:business( playerid, params[ ] )
 					UpdateBusinessData( b );
 					UpdateBusinessTitle( b );
 					GivePlayerCash( playerid, -( g_businessData[ b ] [ E_COST ] ), .force_save = true );
-					SendClientMessageFormatted( playerid, -1, ""COL_GREY"[BUSINESS]"COL_WHITE" You have bought this business for "COL_GOLD"%s"COL_WHITE".", ConvertPrice( g_businessData[ b ] [ E_COST ] ) );
+					SendClientMessageFormatted( playerid, -1, ""COL_GREY"[BUSINESS]"COL_WHITE" You have bought this business for "COL_GOLD"%s"COL_WHITE".", number_format( g_businessData[ b ] [ E_COST ] ) );
 					return 1;
 				}
 			    else return SendError( playerid, "This business isn't for sale." );
@@ -8622,7 +8628,7 @@ CMD:business( playerid, params[ ] )
 			GivePlayerCash( playerid, iCashMoney );
 
 			SetPlayerPosEx( playerid, g_businessData[ iBusiness ] [ E_X ], g_businessData[ iBusiness ] [ E_Y ], g_businessData[ iBusiness ] [ E_Z ], 0 ), SetPlayerVirtualWorld( playerid, 0 );
-			SendServerMessage( playerid, "You have successfully sold your business for "COL_GOLD"%s"COL_WHITE".", ConvertPrice( iCashMoney ) );
+			SendServerMessage( playerid, "You have successfully sold your business for "COL_GOLD"%s"COL_WHITE".", number_format( iCashMoney ) );
 		}
 		return 1;
 	}
@@ -8733,7 +8739,7 @@ CMD:race( playerid, params[ ] )
 			return SendError( playerid, "You cannot invite players once you start the race." );
 
 		p_raceInvited[ inviteid ] [ raceid ] = true;
-		SendClientMessageFormatted( inviteid, COLOR_GREY, "[RACE]{FFFFFF} %s(%d) has invited you to their race for %s, to join type \"/race join %d\"", ReturnPlayerName( playerid ), playerid,  g_raceData[ raceid ] [ E_ENTRY_FEE ] <= 0 ? ( "free" ) : ( ConvertPrice( g_raceData[ raceid ] [ E_ENTRY_FEE ] ) ), raceid );
+		SendClientMessageFormatted( inviteid, COLOR_GREY, "[RACE]{FFFFFF} %s(%d) has invited you to their race for %s, to join type \"/race join %d\"", ReturnPlayerName( playerid ), playerid,  g_raceData[ raceid ] [ E_ENTRY_FEE ] <= 0 ? ( "free" ) : ( number_format( g_raceData[ raceid ] [ E_ENTRY_FEE ] ) ), raceid );
 	    SendClientMessageFormatted( playerid, COLOR_GREY, "[RACE]{FFFFFF} You have invited %s(%d) to join your race.", ReturnPlayerName( inviteid ), inviteid );
 		return 1;
 	}
@@ -8747,7 +8753,7 @@ CMD:race( playerid, params[ ] )
 		else if ( ! p_raceInvited[ playerid ] [ raceid ] ) return SendError( playerid, "You have not been invited to this race lobby." );
 		else if( GetDistanceBetweenPlayers( playerid, g_raceData[ raceid ] [ E_LOBBY_HOST ] ) > 50.0 ) return SendError( playerid, "This player must be within 50 meters to you." );
 		else if ( g_raceData[ raceid ] [ E_STARTED ] ) return SendError( playerid, "The race has already started." );
-		else if ( g_raceData[ raceid ] [ E_ENTRY_FEE ] > GetPlayerCash( playerid ) ) return SendError( playerid, "You need at least %s to join the race.", ConvertPrice( g_raceData[ raceid ] [ E_ENTRY_FEE ] - GetPlayerCash( playerid ) ) );
+		else if ( g_raceData[ raceid ] [ E_ENTRY_FEE ] > GetPlayerCash( playerid ) ) return SendError( playerid, "You need at least %s to join the race.", number_format( g_raceData[ raceid ] [ E_ENTRY_FEE ] - GetPlayerCash( playerid ) ) );
 		else
 		{
 			// enter race lobby
@@ -8913,7 +8919,7 @@ CMD:race( playerid, params[ ] )
 		{
 			GivePlayerCash( playerid, -amount );
 			g_raceData[ raceid ] [ E_POOL ] += amount;
-			SendClientMessageToRace( raceid, COLOR_GREY, "[RACE]"COL_WHITE" %s(%d) has contributed %s to the prize pool (total %s).", ReturnPlayerName( playerid ), playerid, ConvertPrice( amount ), ConvertPrice( g_raceData[ raceid ] [ E_POOL ] ) );
+			SendClientMessageToRace( raceid, COLOR_GREY, "[RACE]"COL_WHITE" %s(%d) has contributed %s to the prize pool (total %s).", ReturnPlayerName( playerid ), playerid, number_format( amount ), number_format( g_raceData[ raceid ] [ E_POOL ] ) );
 			return 1;
 		}
 	}
@@ -9163,7 +9169,7 @@ CMD:garage( playerid, params[ ] )
 					UpdateGarageData( g );
 					UpdateGarageTitle( g );
 					GivePlayerCash( playerid, -( g_garageData[ g ] [ E_PRICE ] ), .force_save = true );
-					SendClientMessageFormatted( playerid, -1, ""COL_GREY"[GARAGE]"COL_WHITE" You have bought this garage for "COL_GOLD"%s"COL_WHITE".", ConvertPrice( g_garageData[ g ] [ E_PRICE ] ) );
+					SendClientMessageFormatted( playerid, -1, ""COL_GREY"[GARAGE]"COL_WHITE" You have bought this garage for "COL_GOLD"%s"COL_WHITE".", number_format( g_garageData[ g ] [ E_PRICE ] ) );
 					return 1;
 				}
 			    else return SendError( playerid, "This garage isn't for sale." );
@@ -9263,7 +9269,7 @@ CMD:garage( playerid, params[ ] )
 			GivePlayerCash( playerid, iCashMoney );
 
 			SetPlayerPosEx( playerid, g_garageData[ iGarage ] [ E_X ], g_garageData[ iGarage ] [ E_Y ], g_garageData[ iGarage ] [ E_Z ], 0 ), SetPlayerVirtualWorld( playerid, 0 );
-			SendServerMessage( playerid, "You have successfully sold your garage for "COL_GOLD"%s"COL_WHITE".", ConvertPrice( iCashMoney ) );
+			SendServerMessage( playerid, "You have successfully sold your garage for "COL_GOLD"%s"COL_WHITE".", number_format( iCashMoney ) );
 
 			// Destroy garage, prevent resale
 			DestroyGarage( iGarage );
@@ -9483,7 +9489,7 @@ CMD:eventbank( playerid, params[ ] )
 	    	GivePlayerCash( playerid, -iAmount );
 			p_AntiSpammyTS[ playerid ] = g_iTime + 15;
 			UpdateServerVariable( "eventbank", GetGVarInt( "eventbank" ) + iAmount, 0.0, "", GLOBAL_VARTYPE_INT );
-			SendGlobalMessage( playerid, ""COL_GOLD"[EVENT BANK]"COL_WHITE" Thanks for donating %s to the event bank, %s!", ConvertPrice( iAmount ), ReturnPlayerName( playerid ) );
+			SendGlobalMessage( playerid, ""COL_GOLD"[EVENT BANK]"COL_WHITE" Thanks for donating %s to the event bank, %s!", number_format( iAmount ), ReturnPlayerName( playerid ) );
 	    }
 	}
 	else if ( !strcmp( params, "withdraw", false, 8 ) )
@@ -9496,12 +9502,12 @@ CMD:eventbank( playerid, params[ ] )
 	    {
 	    	GivePlayerCash( playerid, iAmount );
 			UpdateServerVariable( "eventbank", GetGVarInt( "eventbank" ) - iAmount, 0.0, "", GLOBAL_VARTYPE_INT );
-			SendGlobalMessage( -1, ""COL_GOLD"[EVENT BANK]"COL_WHITE" %s(%d) has withdrawn %s from the event bank!", ReturnPlayerName( playerid ), playerid, ConvertPrice( iAmount ) );
+			SendGlobalMessage( -1, ""COL_GOLD"[EVENT BANK]"COL_WHITE" %s(%d) has withdrawn %s from the event bank!", ReturnPlayerName( playerid ), playerid, number_format( iAmount ) );
 	    }
 	}
 	else if ( strmatch( params, "balance" ) )
 	{
-		SendServerMessage( playerid, "The event bank balance is "COL_GOLD"%s"COL_WHITE". To donate, type "COL_GREY"/eventbank donate"COL_WHITE".", ConvertPrice( GetGVarInt( "eventbank" ) ) );
+		SendServerMessage( playerid, "The event bank balance is "COL_GOLD"%s"COL_WHITE". To donate, type "COL_GREY"/eventbank donate"COL_WHITE".", number_format( GetGVarInt( "eventbank" ) ) );
 	}
 	else if ( strmatch( params, "host" ) )
 	{
@@ -9894,7 +9900,7 @@ CMD:meth( playerid, params[ ] )
 			cashEarned = p_Methamphetamine{ playerid } * ( 3500 + random( 1000 ) );
 
 		GivePlayerCash( playerid, cashEarned );
-		SendServerMessage( playerid, "You have exported %d bags of meth, earning you "COL_GOLD"%s"COL_WHITE".", p_Methamphetamine{ playerid }, ConvertPrice( cashEarned ) );
+		SendServerMessage( playerid, "You have exported %d bags of meth, earning you "COL_GOLD"%s"COL_WHITE".", p_Methamphetamine{ playerid }, number_format( cashEarned ) );
 		p_Methamphetamine{ playerid } = 0;
 	}
 	else SendUsage( playerid, "/meth [COOK/EXPORT]" );
@@ -9976,7 +9982,7 @@ CMD:ore( playerid, params[ ] )
 		format( szOres, sizeof( szOres ), "mine_%d_ores", vehicleid );
 		format( szCash, sizeof( szCash ), "mine_%d_cash", vehicleid );
 
-		SendServerMessage( playerid, "This Dune has %d ore(s) which values "COL_GOLD"%s"COL_WHITE".", GetGVarInt( szOres ), ConvertPrice( GetGVarInt( szCash ) ) );
+		SendServerMessage( playerid, "This Dune has %d ore(s) which values "COL_GOLD"%s"COL_WHITE".", GetGVarInt( szOres ), number_format( GetGVarInt( szCash ) ) );
 	}
 	else SendUsage( playerid, "/ore [MINE/STORE/VALUE]" );
 	return 1;
@@ -10232,7 +10238,7 @@ CMD:playerjobs( playerid, params[ ] )
 
 CMD:getmytax( playerid, params[ ] )
 {
-	SendServerMessage( playerid, "Your tax is "COL_GOLD"%s"COL_WHITE" per 24 minutes.", ConvertPrice( getPlayerTax( playerid ) ) );
+	SendServerMessage( playerid, "Your tax is "COL_GOLD"%s"COL_WHITE" per 24 minutes.", number_format( getPlayerTax( playerid ) ) );
 	return 1;
 }
 
@@ -10251,7 +10257,7 @@ thread gettotalcash( playerid )
 	if ( rows )
 	{
 		cache_get_field_content( 0, "total_cash", Field );
-		SendServerMessage( playerid, "Total: "COL_GOLD"%s"COL_WHITE", Tax Rate: "COL_GOLD"%s"COL_WHITE" per 24 mins.", ConvertPrice( strval( Field ) ), ConvertPrice( floatround( strval( Field ) / 1000 * GetTaxRate( ) ) ) );
+		SendServerMessage( playerid, "Total: "COL_GOLD"%s"COL_WHITE", Tax Rate: "COL_GOLD"%s"COL_WHITE" per 24 mins.", number_format( strval( Field ) ), number_format( floatround( strval( Field ) / 1000 * GetTaxRate( ) ) ) );
 	}
 	else SendError( playerid, "An error has occurred, try again later." );
 	return 1;
@@ -10287,8 +10293,8 @@ CMD:ransompay( playerid, params[ ] )
 		p_TiedLabel[ playerid ] = Text3D: INVALID_3DTEXT_ID;
 		GivePlayerCash( playerid, -p_RansomAmount[ playerid ] );
 		GivePlayerCash( p_RansomPlacer[ playerid ], p_RansomAmount[ playerid ] );
-		SendClientMessageFormatted( p_RansomPlacer[ playerid ], -1, ""COL_GREEN"[RANSOM PAY]{FFFFFF} %s(%d) has paid his ransom ("COL_GOLD"%s"COL_WHITE").", ReturnPlayerName( playerid ), playerid, ConvertPrice( p_RansomAmount[ playerid ] ) );
-		SendClientMessageFormatted( playerid, -1, ""COL_RED"[RANSOM PAY]{FFFFFF} You have paid your ransom ("COL_GOLD"%s"COL_WHITE"), you are now released.", ConvertPrice( p_RansomAmount[ playerid ] ) );
+		SendClientMessageFormatted( p_RansomPlacer[ playerid ], -1, ""COL_GREEN"[RANSOM PAY]{FFFFFF} %s(%d) has paid his ransom ("COL_GOLD"%s"COL_WHITE").", ReturnPlayerName( playerid ), playerid, number_format( p_RansomAmount[ playerid ] ) );
+		SendClientMessageFormatted( playerid, -1, ""COL_RED"[RANSOM PAY]{FFFFFF} You have paid your ransom ("COL_GOLD"%s"COL_WHITE"), you are now released.", number_format( p_RansomAmount[ playerid ] ) );
 		Beep( p_RansomPlacer[ playerid ] );
 		GivePlayerWantedLevel( p_RansomPlacer[ playerid ], 6 );
 		p_RansomAmount[ playerid ] = 0;
@@ -10323,8 +10329,8 @@ CMD:ransom( playerid, params[ ] )
 		if ( IsPlayerTazed( playerid ) ) return SendError( playerid, "You cannot use this command while you're tazed." );
 		if ( IsPlayerInPaintBall( playerid ) ) return SendError( playerid, "You cannot use this command since you're inside the paintball arena." );
 
-		SendClientMessageFormatted( victimid, -1, ""COL_RED"[RANSOM]{FFFFFF} You have been offered a ransom of "COL_GOLD"%s"COL_WHITE" for your release. Use /ransompay to pay the ransom.", ConvertPrice( amount ) );
-	    SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[RANSOM]{FFFFFF} You have offered a ransom to %s(%d) of "COL_GOLD"%s"COL_WHITE".", ReturnPlayerName( victimid ), victimid, ConvertPrice( amount ) );
+		SendClientMessageFormatted( victimid, -1, ""COL_RED"[RANSOM]{FFFFFF} You have been offered a ransom of "COL_GOLD"%s"COL_WHITE" for your release. Use /ransompay to pay the ransom.", number_format( amount ) );
+	    SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[RANSOM]{FFFFFF} You have offered a ransom to %s(%d) of "COL_GOLD"%s"COL_WHITE".", ReturnPlayerName( victimid ), victimid, number_format( amount ) );
 		p_RansomAmount[ victimid ] = amount;
 		p_RansomPlacer[ victimid ] = playerid;
 		p_RansomTimestamp[ victimid ] = g_iTime + 15;
@@ -10851,7 +10857,7 @@ CMD:mech( playerid, params[ ] )
 			cost = IsBusinessAerialVehicle( g_isBusinessVehicle[ iVehicle ], GetVehicleModel( iVehicle ) ) ? 2500 : 750;
 
    		if ( GetPlayerCash( playerid ) < cost )
-   			return SendError( playerid, "You need %s to fix this vehicle.", ConvertPrice( cost ) );
+   			return SendError( playerid, "You need %s to fix this vehicle.", number_format( cost ) );
 
 		PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 );
 		p_DamageSpamCount{ playerid } = 0;
@@ -10909,7 +10915,7 @@ CMD:mech( playerid, params[ ] )
 			cost = IsBusinessAerialVehicle( g_isBusinessVehicle[ iVehicle ], GetVehicleModel( iVehicle ) ) ? 3000 : 1250;
 
    		if ( GetPlayerCash( playerid ) < cost )
-   			return SendError( playerid, "You need %s to fix this vehicle.", ConvertPrice( cost ) );
+   			return SendError( playerid, "You need %s to fix this vehicle.", number_format( cost ) );
 
 		PlayerPlaySound( playerid, 1133, 0.0, 0.0, 5.0 );
 		p_DamageSpamCount{ playerid } = 0;
@@ -10928,7 +10934,7 @@ CMD:mech( playerid, params[ ] )
    			iPrice;
 
    		if ( ( iPrice = calculateVehicleSellPrice( iVehicle ) ) )
-			ShowPlayerHelpDialog( playerid, 3000, "You can export this vehicle at the docks for around ~g~%s~w~~h~.~n~~n~~r~Damaging the vehicle will further decrease the value.", ConvertPrice( iPrice ) );
+			ShowPlayerHelpDialog( playerid, 3000, "You can export this vehicle at the docks for around ~g~%s~w~~h~.~n~~n~~r~Damaging the vehicle will further decrease the value.", number_format( iPrice ) );
    		else
 			ShowPlayerHelpDialog( playerid, 3000, "~r~This vehicle cannot be sold." );
 	}
@@ -11266,8 +11272,8 @@ CMD:weed( playerid, params[ ] )
 			p_WeedTick[ pID ] = GetTickCount( );
 			p_WeedSellingGrams[ pID ] = iAmount;
 			p_SellingWeedTick[ playerid ] = g_iTime + 60;
-			SendClientMessageFormatted( pID, -1, ""COL_ORANGE"[DRUG DEAL]{FFFFFF} %s(%d) is selling you %d gram(s) of weed for %s. "COL_ORANGE"/weed buy"COL_WHITE" to buy.", ReturnPlayerName( playerid ), playerid, iAmount, ConvertPrice( iCost ) );
-			SendClientMessageFormatted( playerid, -1, ""COL_ORANGE"[DRUG DEAL]{FFFFFF} You have sent an offer to %s(%d) to buy a %d gram(s) of weed for "COL_GOLD"%s.", ReturnPlayerName( pID ), pID, iAmount, ConvertPrice( iTaxed ) );
+			SendClientMessageFormatted( pID, -1, ""COL_ORANGE"[DRUG DEAL]{FFFFFF} %s(%d) is selling you %d gram(s) of weed for %s. "COL_ORANGE"/weed buy"COL_WHITE" to buy.", ReturnPlayerName( playerid ), playerid, iAmount, number_format( iCost ) );
+			SendClientMessageFormatted( playerid, -1, ""COL_ORANGE"[DRUG DEAL]{FFFFFF} You have sent an offer to %s(%d) to buy a %d gram(s) of weed for "COL_GOLD"%s.", ReturnPlayerName( pID ), pID, iAmount, number_format( iTaxed ) );
 	    }
 	    else SendError( playerid, "This player is not nearby." );
 	}
@@ -11284,7 +11290,7 @@ CMD:weed( playerid, params[ ] )
 		    	iTaxed 	 = floatround( iCost * 0.8 )
 		    ;
 
-			if ( GetPlayerCash( playerid ) < iCost ) return SendError( playerid, "You need %s to buy %d grams of weed.", ConvertPrice( iCost ), iGrams );
+			if ( GetPlayerCash( playerid ) < iCost ) return SendError( playerid, "You need %s to buy %d grams of weed.", number_format( iCost ), iGrams );
 			else if ( IsPlayerInPaintBall( dealerid ) ) return SendError( playerid, "Your dealer cannot deal while he's in paintball." );
 			else if ( p_Class[ dealerid ] != CLASS_CIVILIAN ) return p_WeedDealer[ playerid ] = INVALID_PLAYER_ID, SendError( playerid, "This deal has ended, the dealer is not a civilian." );
 			else if ( !JobEquals( dealerid, JOB_DRUG_DEALER ) ) return SendError( playerid, "Your dealer no longer does drugs." );
@@ -11298,8 +11304,8 @@ CMD:weed( playerid, params[ ] )
 				GivePlayerCash( playerid, -iCost );
 				GivePlayerCash( dealerid, iTaxed );
 
-				SendClientMessageFormatted( dealerid, -1, ""COL_ORANGE"[DRUG DEAL]{FFFFFF} %s(%d) has bought %d grams of weed off you for %s.", ReturnPlayerName( playerid ), playerid, iGrams, ConvertPrice( iTaxed ) );
-				SendClientMessageFormatted( playerid, -1, ""COL_ORANGE"[DRUG DEAL]{FFFFFF} You have bought %d grams of weed for %s.", iGrams, ConvertPrice( iCost ) );
+				SendClientMessageFormatted( dealerid, -1, ""COL_ORANGE"[DRUG DEAL]{FFFFFF} %s(%d) has bought %d grams of weed off you for %s.", ReturnPlayerName( playerid ), playerid, iGrams, number_format( iTaxed ) );
+				SendClientMessageFormatted( playerid, -1, ""COL_ORANGE"[DRUG DEAL]{FFFFFF} You have bought %d grams of weed for %s.", iGrams, number_format( iCost ) );
 
 				GivePlayerWantedLevel( dealerid, 6 );
 				GivePlayerWantedLevel( playerid, 6 );
@@ -12176,8 +12182,8 @@ CMD:bail( playerid, params[ ] )
 	    p_BailOfferer[ pID ] = playerid;
 	    p_BailTimestamp[ pID ] = g_iTime + 120;
 	    SetPVarInt( pID, "bail_antispam", g_iTime + 1 );
-	    SendServerMessage( playerid, "You have offered %s(%d) bail for "COL_GOLD"%s", ReturnPlayerName( pID ), pID, ConvertPrice( equa ) );
-	    SendClientMessageFormatted( pID, -1, ""COL_GREY"[SERVER]"COL_WHITE" %s(%d) has offered to bail you out for "COL_GOLD"%s"COL_WHITE". "COL_ORANGE"/acceptbail"COL_WHITE" to accept the bail.", ReturnPlayerName( playerid ), playerid, ConvertPrice( equa ) );
+	    SendServerMessage( playerid, "You have offered %s(%d) bail for "COL_GOLD"%s", ReturnPlayerName( pID ), pID, number_format( equa ) );
+	    SendClientMessageFormatted( pID, -1, ""COL_GREY"[SERVER]"COL_WHITE" %s(%d) has offered to bail you out for "COL_GOLD"%s"COL_WHITE". "COL_ORANGE"/acceptbail"COL_WHITE" to accept the bail.", ReturnPlayerName( playerid ), playerid, number_format( equa ) );
 	}
 	return 1;
 }
@@ -12199,7 +12205,7 @@ CMD:acceptbail( playerid, params[ ] )
 
 	    GivePlayerCash( playerid, -equa );
 		GivePlayerCash( p_BailOfferer[ playerid ], cashEarned );
-		SendClientMessageFormatted( p_BailOfferer[ playerid ], -1, ""COL_GREEN"[BAIL]"COL_WHITE" %s(%d) has paid bail. You have earned "COL_GOLD"%s"COL_WHITE" from his bail.", ReturnPlayerName( playerid ), playerid, ConvertPrice( cashEarned ) );
+		SendClientMessageFormatted( p_BailOfferer[ playerid ], -1, ""COL_GREEN"[BAIL]"COL_WHITE" %s(%d) has paid bail. You have earned "COL_GOLD"%s"COL_WHITE" from his bail.", ReturnPlayerName( playerid ), playerid, number_format( cashEarned ) );
     	p_BailOfferer[ playerid ] = INVALID_PLAYER_ID;
         SendServerMessage( playerid, "You have paid for your bail. You are now free!" );
 	   	CallLocalFunction( "OnPlayerUnjailed", "dd", playerid, 1 );
@@ -12231,7 +12237,7 @@ CMD:acceptbj( playerid, params[ ] )
 		    iEarned = floatround( iPrice * 0.90 )
 		;
 
-		SendClientMessageFormatted( p_BlowjobOfferer[ playerid ], -1, ""COL_ORANGE"[BLOWJOB]{FFFFFF} %s(%d) has accepted your blowjob offer for "COL_GOLD"%s"COL_WHITE".", ReturnPlayerName( playerid ), playerid, ConvertPrice( iPrice ) );
+		SendClientMessageFormatted( p_BlowjobOfferer[ playerid ], -1, ""COL_ORANGE"[BLOWJOB]{FFFFFF} %s(%d) has accepted your blowjob offer for "COL_GOLD"%s"COL_WHITE".", ReturnPlayerName( playerid ), playerid, number_format( iPrice ) );
 		SendClientMessageFormatted( playerid, -1, ""COL_ORANGE"[BLOWJOB]{FFFFFF} You are now recieving a blowjob." );
 		TogglePlayerControllable( p_BlowjobOfferer[ playerid ], 0 );
 		TogglePlayerControllable( playerid, 0 );
@@ -12273,8 +12279,8 @@ CMD:bj( playerid, params[ ] )
 	else if ( GetDistanceBetweenPlayers( playerid, pID ) < 4.0 )
 	{
 		if ( IsPlayerJailed( pID ) ) return SendError( playerid, "This player is jailed. He may be paused." );
-	  	SendClientMessageFormatted( pID, -1, ""COL_ORANGE"[BLOWJOB]{FFFFFF} %s(%d) wishes to give you a blowjob for "COL_GOLD"%s"COL_WHITE". "COL_ORANGE"/acceptbj{FFFFFF} to accept.", ReturnPlayerName( playerid ), playerid, ConvertPrice( price ) );
-		SendClientMessageFormatted( playerid, -1, ""COL_ORANGE"[BLOWJOB]{FFFFFF} You have offered a blowjob to %s(%d) for "COL_GOLD"%s"COL_WHITE".", ReturnPlayerName( pID ), pID, ConvertPrice( price ) );
+	  	SendClientMessageFormatted( pID, -1, ""COL_ORANGE"[BLOWJOB]{FFFFFF} %s(%d) wishes to give you a blowjob for "COL_GOLD"%s"COL_WHITE". "COL_ORANGE"/acceptbj{FFFFFF} to accept.", ReturnPlayerName( playerid ), playerid, number_format( price ) );
+		SendClientMessageFormatted( playerid, -1, ""COL_ORANGE"[BLOWJOB]{FFFFFF} You have offered a blowjob to %s(%d) for "COL_GOLD"%s"COL_WHITE".", ReturnPlayerName( pID ), pID, number_format( price ) );
 		p_BlowjobOfferer[ pID ] = playerid;
 	    p_BlowjobDealTick[ pID ] = g_iTime + 60;
 	    p_BlowjobPrice[ pID ] = price;
@@ -12416,7 +12422,7 @@ CMD:h( playerid, params[ ] )
 						return SendError( playerid, "You are not a V.I.P, to become one visit "COL_GREY"donate.irresistiblegaming.com" );
 
 					GivePlayerCash( playerid, -( g_houseData[ i ] [ E_COST ] ), .force_save = true );
-					SendServerMessage( playerid, "You have bought this home for "COL_GOLD"%s"COL_WHITE"!", ConvertPrice( g_houseData[ i ] [ E_COST ] ) );
+					SendServerMessage( playerid, "You have bought this home for "COL_GOLD"%s"COL_WHITE"!", number_format( g_houseData[ i ] [ E_COST ] ) );
                     SetHouseOwner( i, ReturnPlayerName( playerid ) );
 
 					p_OwnedHouses[ playerid ] ++;
@@ -12450,7 +12456,7 @@ CMD:h( playerid, params[ ] )
 			g_houseData[ ID ] [ E_INTERIOR_ID ] = 2;
 			format( query, sizeof( query ), "UPDATE HOUSES SET OWNER='No-one',PASSWORD='N/A',NAME='Home',TX=%f,TY=%f,TZ=%f,INTERIOR=%d WHERE ID=%d", g_houseData[ ID ] [ E_TX ], g_houseData[ ID ] [ E_TY ], g_houseData[ ID ] [ E_TZ ], g_houseData[ ID ] [ E_INTERIOR_ID ], ID );
 		    mysql_single_query( query );
-			format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" Home(%d)\n"COL_GOLD"Owner:"COL_WHITE" No-one\n"COL_GOLD"Price:"COL_WHITE" %s", ID, ConvertPrice( g_houseData[ ID ] [ E_COST ] ) );
+			format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" Home(%d)\n"COL_GOLD"Owner:"COL_WHITE" No-one\n"COL_GOLD"Price:"COL_WHITE" %s", ID, number_format( g_houseData[ ID ] [ E_COST ] ) );
 			UpdateDynamic3DTextLabelText( g_houseData[ ID ] [ E_LABEL ] [ 0 ], COLOR_WHITE, szBigString );
 			DestroyDynamic3DTextLabel( g_houseData[ ID ] [ E_LABEL ] [ 1 ] );
 			g_houseData[ ID ] [ E_LABEL ] [ 1 ] = CreateDynamic3DTextLabel( "[EXIT]", COLOR_GOLD, g_houseData[ ID ] [ E_TX ], g_houseData[ ID ] [ E_TY ], g_houseData[ ID ] [ E_TZ ], 20.0, INVALID_PLAYER_ID, INVALID_VEHICLE_ID, 0, g_houseData[ ID ] [ E_WORLD ] );
@@ -12460,7 +12466,7 @@ CMD:h( playerid, params[ ] )
 			DestroyDynamicMapIcon( g_houseData[ ID ] [ E_MAP_ICON ] );
 			SetPlayerInterior( playerid, 0 );
 			SetPlayerVirtualWorld( playerid, 0 );
-			SendServerMessage( playerid, "You have successfully sold your house for "COL_GOLD"%s", ConvertPrice( ( g_houseData[ ID ] [ E_COST ] / 2 ) ) );
+			SendServerMessage( playerid, "You have successfully sold your house for "COL_GOLD"%s", number_format( ( g_houseData[ ID ] [ E_COST ] / 2 ) ) );
 		}
 		return 1;
 	}
@@ -12496,12 +12502,12 @@ CMD:h( playerid, params[ ] )
 
 		if ( !IsPlayerConnected( sellerid ) ) SendError( playerid, "The person who offered you a house is no longer online." );
 		else if ( p_HouseOfferTicks[ playerid ] < g_iTime ) SendError( playerid, "This house offer has expired %d seconds ago.", g_iTime - p_HouseOfferTicks[ playerid ] );
-		else if ( GetPlayerCash( playerid ) < p_HouseSellingPrice[ playerid ] ) SendError( playerid, "You do not have enough money to accept this offer (%s).", ConvertPrice( p_HouseSellingPrice[ playerid ] ) );
+		else if ( GetPlayerCash( playerid ) < p_HouseSellingPrice[ playerid ] ) SendError( playerid, "You do not have enough money to accept this offer (%s).", number_format( p_HouseSellingPrice[ playerid ] ) );
 		else if ( g_houseData[ houseid ] [ E_COST ] <= 1337 && !p_VIPLevel[ playerid ] ) SendError( playerid, "You are not a V.I.P, to become one visit "COL_GREY"donate.irresistiblegaming.com" );
 		else if ( hasTooManyHouses( playerid ) ) SendError( playerid, "You cannot purchase any more houses, you've reached the limit." );
 		else
 		{
-			format( szBigString, sizeof( szBigString ), "[SELL TO] [%s] %s | %s | %s | %d\r\n", getCurrentDate( ), ReturnPlayerName( playerid ), ReturnPlayerName( sellerid ), ConvertPrice( sellingprice ), houseid );
+			format( szBigString, sizeof( szBigString ), "[SELL TO] [%s] %s | %s | %s | %d\r\n", getCurrentDate( ), ReturnPlayerName( playerid ), ReturnPlayerName( sellerid ), number_format( sellingprice ), houseid );
 		    AddFileLogLine( "log_houses.txt", szBigString );
 
 			p_OwnedHouses[ sellerid ] --;
@@ -12514,8 +12520,8 @@ CMD:h( playerid, params[ ] )
 			GivePlayerCash( sellerid, sellingprice );
 
 			if ( p_HouseSpawnLocation[ sellerid ] == houseid ) p_HouseSpawnLocation[ sellerid ] = -1;
-			SendServerMessage( sellerid, "You have successfully sold your house for "COL_GOLD"%s"COL_WHITE" to %s(%d)!", ConvertPrice( p_HouseSellingPrice[ playerid ] ), ReturnPlayerName( playerid ), playerid );
-			SendServerMessage( playerid, "You have successfully bought %s(%d)'s home for "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( sellerid ), sellerid, ConvertPrice( p_HouseSellingPrice[ playerid ] ) );
+			SendServerMessage( sellerid, "You have successfully sold your house for "COL_GOLD"%s"COL_WHITE" to %s(%d)!", number_format( p_HouseSellingPrice[ playerid ] ), ReturnPlayerName( playerid ), playerid );
+			SendServerMessage( playerid, "You have successfully bought %s(%d)'s home for "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( sellerid ), sellerid, number_format( p_HouseSellingPrice[ playerid ] ) );
 		}
 		return ( p_HouseOfferer[ playerid ] = INVALID_PLAYER_ID ), ( p_HouseOfferTicks[ playerid ] = 0 ), 1;
 	}
@@ -12541,8 +12547,8 @@ CMD:h( playerid, params[ ] )
 			p_HouseOfferTicks[ offerid ] = g_iTime + 15;
 			p_HouseSellingID[ offerid ] = ID;
 			p_HouseSellingPrice[ offerid ] = price;
-			SendServerMessage( offerid, "%s(%d) wishes to offer his house (id %d) for %s to you. Use "COL_GREY"/h offer take"COL_WHITE" to take the offer.", ReturnPlayerName( playerid ), playerid, ID, ConvertPrice( price ) );
-			SendServerMessage( playerid, "You have offered %s(%d) %s for your house (id %d), cancel the offer with "COL_GREY"/h offer cancel"COL_WHITE".", ReturnPlayerName( offerid ), offerid, ConvertPrice( price ), ID );
+			SendServerMessage( offerid, "%s(%d) wishes to offer his house (id %d) for %s to you. Use "COL_GREY"/h offer take"COL_WHITE" to take the offer.", ReturnPlayerName( playerid ), playerid, ID, number_format( price ) );
+			SendServerMessage( playerid, "You have offered %s(%d) %s for your house (id %d), cancel the offer with "COL_GREY"/h offer cancel"COL_WHITE".", ReturnPlayerName( offerid ), offerid, number_format( price ), ID );
 	    }
 	    return 1;
 	}
@@ -12561,7 +12567,7 @@ stock SwitchHouseOwners( ID, playerid, buyerid )
 
 		SetPlayerInterior( playerid, 0 );
 		SetPlayerVirtualWorld( playerid, 0 );
-		SendServerMessage( playerid, "You have successfully sold your house for "COL_GOLD"%s", ConvertPrice( ( g_houseData[ ID ] [ E_COST ] / 2 ) ) );
+		SendServerMessage( playerid, "You have successfully sold your house for "COL_GOLD"%s", number_format( ( g_houseData[ ID ] [ E_COST ] / 2 ) ) );
 		SetPlayerPos( playerid, g_houseData[ ID ] [ E_EX ], g_houseData[ ID ] [ E_EY ], g_houseData[ ID ] [ E_EZ ] );
 	}
 
@@ -12574,7 +12580,7 @@ stock SwitchHouseOwners( ID, playerid, buyerid )
 	format( szBigString, sizeof( szBigString ), "UPDATE HOUSES SET OWNER='%s',PASSWORD='N/A',NAME='Home' WHERE ID=%d", mysql_escape( ReturnPlayerName( buyerid ) ) , ID );
     mysql_single_query( szBigString );
 
-	format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" Home(%d)\n"COL_GOLD"Owner:"COL_WHITE" No-one\n"COL_GOLD"Price:"COL_WHITE" %s", ID, ConvertPrice( g_houseData[ ID ] [ E_COST ] ) );
+	format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" Home(%d)\n"COL_GOLD"Owner:"COL_WHITE" No-one\n"COL_GOLD"Price:"COL_WHITE" %s", ID, number_format( g_houseData[ ID ] [ E_COST ] ) );
 	UpdateDynamic3DTextLabelText( g_houseData[ ID ] [ E_LABEL ] [ 0 ], COLOR_WHITE, szBigString );
 
 	DestroyDynamic3DTextLabel( g_houseData[ ID ] [ E_LABEL ] [ 1 ] );
@@ -12676,7 +12682,7 @@ CMD:v( playerid, params[ ] )
 			format( szBigString, sizeof( szBigString ), "[SELL] [%s] %s | %d | %s\r\n", getCurrentDate( ), ReturnPlayerName( playerid ), v, GetVehicleName( GetVehicleModel( g_vehicleData[ playerid ] [ v ] [ E_VEHICLE_ID ] ) ) );
 		    AddFileLogLine( "log_destroycar.txt", szBigString );
             GivePlayerCash( playerid, ( g_vehicleData[ playerid ] [ v ] [ E_PRICE ] / 2 ) );
-			SendClientMessageFormatted( playerid, -1, ""COL_GREY"[VEHICLE]"COL_WHITE" You have sold this vehicle for half the price it was (%s).", ConvertPrice( ( g_vehicleData[ playerid ] [ v ] [ E_PRICE ] / 2 ) ) );
+			SendClientMessageFormatted( playerid, -1, ""COL_GREY"[VEHICLE]"COL_WHITE" You have sold this vehicle for half the price it was (%s).", number_format( ( g_vehicleData[ playerid ] [ v ] [ E_PRICE ] / 2 ) ) );
             DestroyBuyableVehicle( playerid, v );
 		}
 	}
@@ -12768,7 +12774,7 @@ CMD:v( playerid, params[ ] )
 			                            ""COL_GREY"Vehicle ID:"COL_WHITE" %d\n"\
 			                            ""COL_GREY"Vehicle Price:"COL_WHITE" %s",
 			                            ReturnPlayerName( ownerid ), GetVehicleName( GetVehicleModel( GetPlayerVehicleID( playerid ) ) ),
-			                            g_vehicleData[ playerid ] [ v ] [ E_SQL_ID ], ConvertPrice( g_vehicleData[ playerid ] [ v ] [ E_PRICE ] ) );
+			                            g_vehicleData[ playerid ] [ v ] [ E_SQL_ID ], number_format( g_vehicleData[ playerid ] [ v ] [ E_PRICE ] ) );
 			ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_MSGBOX, "{FFFFFF}Vehicle Data", szBigString, "Okay", "" );
 		}
 	}
@@ -12995,7 +13001,7 @@ CMD:sendmoney( playerid, params[ ] )
      	mysql_single_query( szPayment );
 
         if ( amount > 25000 )
-        	printf("[sendmoney] %s -> %s - %s", ReturnPlayerName( playerid ), ReturnPlayerName( pID ), ConvertPrice( amount ) ); // 8hska7082bmahu
+        	printf("[sendmoney] %s -> %s - %s", ReturnPlayerName( playerid ), ReturnPlayerName( pID ), number_format( amount ) ); // 8hska7082bmahu
 
 		if ( amount > 90000000 ) {
 	   		printf("ISP banned %s for making a 75M transaction", ReturnPlayerName( playerid ));
@@ -13006,8 +13012,8 @@ CMD:sendmoney( playerid, params[ ] )
         GivePlayerCash( pID, amount );
         GivePlayerCash( playerid, -( amount ) );
     	SetPVarInt( playerid, "sm_antispam", iTime + 10 );
-		SendClientMessageFormatted( pID, -1, ""COL_GREEN"[PAYMENT]"COL_WHITE" You have recieved %s from %s(%d).", ConvertPrice( amount ), ReturnPlayerName( playerid ), playerid );
-        SendClientMessageFormatted( playerid, -1, ""COL_RED"[PAYMENT]"COL_WHITE" You have sent %s to %s(%d).", ConvertPrice( amount ), ReturnPlayerName(pID), pID );
+		SendClientMessageFormatted( pID, -1, ""COL_GREEN"[PAYMENT]"COL_WHITE" You have recieved %s from %s(%d).", number_format( amount ), ReturnPlayerName( playerid ), playerid );
+        SendClientMessageFormatted( playerid, -1, ""COL_RED"[PAYMENT]"COL_WHITE" You have sent %s to %s(%d).", number_format( amount ), ReturnPlayerName(pID), pID );
         Beep( pID ), Beep( playerid );
     }
 	return 1;
@@ -13247,8 +13253,8 @@ CMD:placehit( playerid, params[ ] )
 		p_ContractedAmount[ pID ] += cash;
 		GivePlayerCash( playerid, -cash );
 		p_AntiSpammyTS[ playerid  ] = g_iTime + 10;
-		printf("[placehit] %s -> %s - %s", ReturnPlayerName( playerid ), ReturnPlayerName( pID ), ConvertPrice( cash ) ); // 8hska7082bmahu
-		SendGlobalMessage( -1, ""COL_ORANGE"[CONTRACT]"COL_WHITE" %s(%d) has put a contract on %s(%d), his bounty is now "COL_GOLD"%s{FFFFFF}.", ReturnPlayerName( playerid ), playerid, ReturnPlayerName( pID ), pID, ConvertPrice( p_ContractedAmount[ pID ] ) );
+		printf("[placehit] %s -> %s - %s", ReturnPlayerName( playerid ), ReturnPlayerName( pID ), number_format( cash ) ); // 8hska7082bmahu
+		SendGlobalMessage( -1, ""COL_ORANGE"[CONTRACT]"COL_WHITE" %s(%d) has put a contract on %s(%d), his bounty is now "COL_GOLD"%s{FFFFFF}.", ReturnPlayerName( playerid ), playerid, ReturnPlayerName( pID ), pID, number_format( p_ContractedAmount[ pID ] ) );
 	}
 	return 1;
 }
@@ -13751,8 +13757,8 @@ CMD:arrest( playerid, params[ ] )
 		new totalSeconds = p_WantedLevel[ victimid ] * ( JAIL_SECONDS_MULTIPLIER );
 		GivePlayerScore( playerid, 2, .multiplier = 1.5 );
 		GivePlayerCash( playerid, totalCash );
-		if ( totalCash > 20000 ) printf("[police arrest] %s -> %s - %s", ReturnPlayerName( playerid ), ReturnPlayerName( victimid ), ConvertPrice( totalCash ) ); // 8hska7082bmahu
-		SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[ACHIEVE]{FFFFFF} You have earned "COL_GOLD"%s{FFFFFF} dollars and 2 score for arresting %s(%d)!", ConvertPrice( totalCash ), ReturnPlayerName( victimid ), victimid );
+		if ( totalCash > 20000 ) printf("[police arrest] %s -> %s - %s", ReturnPlayerName( playerid ), ReturnPlayerName( victimid ), number_format( totalCash ) ); // 8hska7082bmahu
+		SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[ACHIEVE]{FFFFFF} You have earned "COL_GOLD"%s{FFFFFF} dollars and 2 score for arresting %s(%d)!", number_format( totalCash ), ReturnPlayerName( victimid ), victimid );
 		GameTextForPlayer( victimid, "~r~Busted!", 4000, 0 );
 		CallLocalFunction( "OnPlayerArrest", "dddd", playerid, victimid, p_Arrests[ playerid ], 1 );
 		Untaze( victimid );
@@ -14005,8 +14011,8 @@ CMD:rob( playerid, params[ ] )
 
 			cashRobbed = random( iMoney ) + 10;
 
-			SendClientMessageFormatted( victimid, -1, ""COL_RED"[ROBBED]{FFFFFF} You have been robbed "COL_GOLD"%s{FFFFFF} by %s(%d)!", ConvertPrice( cashRobbed ), ReturnPlayerName( playerid ), playerid );
-		    SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[ROBBED]{FFFFFF} You have robbed "COL_GOLD"%s{FFFFFF} off %s(%d)!", ConvertPrice( cashRobbed ), ReturnPlayerName( victimid ), victimid );
+			SendClientMessageFormatted( victimid, -1, ""COL_RED"[ROBBED]{FFFFFF} You have been robbed "COL_GOLD"%s{FFFFFF} by %s(%d)!", number_format( cashRobbed ), ReturnPlayerName( playerid ), playerid );
+		    SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[ROBBED]{FFFFFF} You have robbed "COL_GOLD"%s{FFFFFF} off %s(%d)!", number_format( cashRobbed ), ReturnPlayerName( victimid ), victimid );
 
 			SplitPlayerCashForGang( playerid, float( cashRobbed ) );
 			GivePlayerWantedLevel( playerid, 4 );
@@ -15815,7 +15821,7 @@ CMD:vadminstats( playerid, params[ ] )
 	                            ""COL_GREY"Vehicle ID:"COL_WHITE" %d\n"\
 	                            ""COL_GREY"Vehicle Price:"COL_WHITE" %s",
 	                            ReturnPlayerName( ownerid ), GetVehicleName( GetVehicleModel( GetPlayerVehicleID( playerid ) ) ),
-	                            g_vehicleData[ ownerid ] [ slotid ] [ E_SQL_ID ], ConvertPrice( g_vehicleData[ ownerid ] [ slotid ] [ E_PRICE ] ) );
+	                            g_vehicleData[ ownerid ] [ slotid ] [ E_SQL_ID ], number_format( g_vehicleData[ ownerid ] [ slotid ] [ E_PRICE ] ) );
 
 	ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_MSGBOX, "{FFFFFF}Vehicle Data", szBigString, "Okay", "" );
 	return 1;
@@ -16136,8 +16142,8 @@ CMD:setworld( playerid, params[ ] )
 		}
 		else
 		{
-			SendClientMessageFormatted( pID, -1, ""COL_PINK"[ADMIN]"COL_WHITE" You have your world to %d.", worldid );
-	 		AddAdminLogLineFormatted( "%s(%d) has changed his world to %d", ReturnPlayerName( pID ), pID, worldid );
+			SendClientMessageFormatted( pID, -1, ""COL_PINK"[ADMIN]"COL_WHITE" You have set your world to %d.", worldid );
+	 		AddAdminLogLineFormatted( "%s(%d) has changed their world to %d", ReturnPlayerName( pID ), pID, worldid );
 		}
 	}
 	return 1;
@@ -16544,7 +16550,7 @@ CMD:creategarage( playerid, params[ ] )
 		    if ( ( iTmp = CreateGarage( 0, cost, 0, X, Y, Z, Angle ) ) != -1 )
 		    {
 				SaveToAdminLog( playerid, iTmp, "created garage" );
-		    	SendClientMessageFormatted( playerid, -1, ""COL_PINK"[GARAGE]"COL_WHITE" You have created a %s garage taking up garage id %d.", ConvertPrice( cost ), iTmp );
+		    	SendClientMessageFormatted( playerid, -1, ""COL_PINK"[GARAGE]"COL_WHITE" You have created a %s garage taking up garage id %d.", number_format( cost ), iTmp );
 		    }
 			else
 				SendClientMessage( playerid, -1, ""COL_PINK"[GARAGE]"COL_WHITE" Unable to create a garage due to a unexpected error." );
@@ -17076,8 +17082,8 @@ CMD:createhouse( playerid, params[ ] )
 		AddAdminLogLineFormatted( "%s(%d) has created a house", ReturnPlayerName( playerid ), playerid );
 		if ( GetPlayerPos( playerid, X, Y, Z ) ) {
 		    if ( ( iTmp = CreateHouse( cost, X, Y, Z ) ) != -1 ) {
-				SaveToAdminLogFormatted( playerid, iTmp, "created house for %s", ConvertPrice( cost ) );
-		    	SendClientMessageFormatted( playerid, -1, ""COL_PINK"[HOUSE]"COL_WHITE" You have created a %s house taking up house id %d.", ConvertPrice( cost ), iTmp );
+				SaveToAdminLogFormatted( playerid, iTmp, "created house for %s", number_format( cost ) );
+		    	SendClientMessageFormatted( playerid, -1, ""COL_PINK"[HOUSE]"COL_WHITE" You have created a %s house taking up house id %d.", number_format( cost ), iTmp );
 		    }
 			else
 				SendClientMessage( playerid, -1, ""COL_PINK"[HOUSE]"COL_WHITE" Unable to create a house due to a unexpected error." );
@@ -17180,7 +17186,7 @@ CMD:createbusiness( playerid, params[ ] )
 
 	    if ( iTmp != ITER_NONE ) {
 			SaveToAdminLog( playerid, iTmp, "created business" );
-	    	SendClientMessageFormatted( playerid, -1, ""COL_PINK"[BUSINESS]"COL_WHITE" You have created a %s business taking up business id %d.", ConvertPrice( cost ), iTmp );
+	    	SendClientMessageFormatted( playerid, -1, ""COL_PINK"[BUSINESS]"COL_WHITE" You have created a %s business taking up business id %d.", number_format( cost ), iTmp );
 	    } else {
 			SendClientMessage( playerid, -1, ""COL_PINK"[BUSINESS]"COL_WHITE" Unable to create a business due to a unexpected error." );
 		}
@@ -18028,8 +18034,8 @@ CMD:givecash( playerid, params [ ] )
 	{
 	    GivePlayerCash( pID, cash );
 		AddAdminLogLineFormatted( "%s(%d) has given %s(%d) %d dollars", ReturnPlayerName( playerid ), playerid, ReturnPlayerName( pID ), pID, cash );
-	    SendClientMessageFormatted( pID, -1, ""COL_PINK"[ADMIN]{FFFFFF} %s(%d) has given you "COL_GOLD"%s", ReturnPlayerName( playerid ), playerid, ConvertPrice( cash ) );
-	    SendClientMessageFormatted( playerid, -1, ""COL_PINK"[ADMIN]{FFFFFF} You've given %s(%d) "COL_GOLD"%s", ReturnPlayerName( pID ), pID, ConvertPrice( cash ) );
+	    SendClientMessageFormatted( pID, -1, ""COL_PINK"[ADMIN]{FFFFFF} %s(%d) has given you "COL_GOLD"%s", ReturnPlayerName( playerid ), playerid, number_format( cash ) );
+	    SendClientMessageFormatted( playerid, -1, ""COL_PINK"[ADMIN]{FFFFFF} You've given %s(%d) "COL_GOLD"%s", ReturnPlayerName( pID ), pID, number_format( cash ) );
 	}
 	return 1;
 }
@@ -18807,7 +18813,7 @@ public OnPlayerDriveVehicle(playerid, vehicleid)
 				// message people
 				g_businessData[ businessid ] [ E_EXPORT_STARTED ] = 1;
 				ShowPlayerHelpDialog( playerid, 5000, "Drop the drugs off on the flag blips of your radar." );
-				SendGlobalMessage( COLOR_GREY, "[BUSINESS]"COL_WHITE" %s(%d) has begun transporting "COL_GOLD"%s"COL_WHITE" of business product!", ReturnPlayerName( playerid ), playerid, ConvertPrice( g_businessData[ businessid ] [ E_EXPORT_VALUE ] * ( MAX_DROPS - g_businessData[ businessid ] [ E_EXPORTED_AMOUNT ] ) ) );
+				SendGlobalMessage( COLOR_GREY, "[BUSINESS]"COL_WHITE" %s(%d) has begun transporting "COL_GOLD"%s"COL_WHITE" of business product!", ReturnPlayerName( playerid ), playerid, number_format( g_businessData[ businessid ] [ E_EXPORT_VALUE ] * ( MAX_DROPS - g_businessData[ businessid ] [ E_EXPORTED_AMOUNT ] ) ) );
 			}
 		}
 	}
@@ -18817,7 +18823,7 @@ public OnPlayerDriveVehicle(playerid, vehicleid)
 		if ( g_LastExportModel[ playerid ] == model )
 			ShowPlayerHelpDialog( playerid, 4000, "You have already exported this vehicle recently and cannot export it again at the docks." );
 		else
-			ShowPlayerHelpDialog( playerid, 6000, "You can export this vehicle at the docks for around ~g~%s~w~~h~.~n~~n~~r~Damaging the vehicle will further decrease the value.", ConvertPrice( iVehiclePrice ) );
+			ShowPlayerHelpDialog( playerid, 6000, "You can export this vehicle at the docks for around ~g~%s~w~~h~.~n~~n~~r~Damaging the vehicle will further decrease the value.", number_format( iVehiclePrice ) );
 	}
 
 	if ( IsPlayerInPoliceCar( playerid ) && p_Class[ playerid ] != CLASS_POLICE && p_LastDrovenPoliceVeh[ playerid ] != vehicleid && GetPVarInt( playerid, "entercopcar_ts" ) < time && !g_buyableVehicle{ vehicleid } )
@@ -18901,7 +18907,7 @@ public OnPlayerDriveVehicle(playerid, vehicleid)
 			SetVehicleParamsEx( vehicleid, VEHICLE_PARAMS_ON, lights, VEHICLE_PARAMS_OFF, doors, bonnet, boot, objective );
 			return 1;
 		}
-		//if ( strmatch( g_vehicleData[ ownerid ] [ slotid ] [ E_OWNER ], "No-one" ) ) SendClientMessageFormatted( playerid, -1, ""COL_GREY"[VEHICLE]"COL_WHITE" This vehicle is for sale (%s)", ConvertPrice( g_vehicleData[ ownerid ] [ slotid ] [ E_PRICE ] ) );
+		//if ( strmatch( g_vehicleData[ ownerid ] [ slotid ] [ E_OWNER ], "No-one" ) ) SendClientMessageFormatted( playerid, -1, ""COL_GREY"[VEHICLE]"COL_WHITE" This vehicle is for sale (%s)", number_format( g_vehicleData[ ownerid ] [ slotid ] [ E_PRICE ] ) );
 		else SendClientMessageFormatted( playerid, -1, ""COL_GREY"[VEHICLE]"COL_WHITE" This vehicle is owned by %s.", ReturnPlayerName( ownerid ) );
 	}
 	if ( p_AdminLevel[ playerid ] < 3 )
@@ -19084,6 +19090,9 @@ public OnPlayerEnterDynamicCP(playerid, checkpointid)
 	if ( checkpointid == g_Checkpoints[ CP_HOSPITAL ] || checkpointid == g_Checkpoints[ CP_HOSPITAL_LV ] || checkpointid == g_Checkpoints[ CP_HOSPITAL1_LS ] || checkpointid == g_Checkpoints[ CP_HOSPITAL2_LS ] || checkpointid == g_Checkpoints[ CP_HOSPITAL_FC ] )
 		return ShowPlayerDialog( playerid, DIALOG_HOSPITAL, DIALOG_STYLE_LIST, "{FFFFFF}Medical Center", ""COL_GOLD"$2,000"COL_WHITE"\t\tHeal Yourself\n"COL_GOLD"$4,000"COL_WHITE"\t\tCure Yourself\n"COL_GOLD"$6,000"COL_WHITE"\t\tCure And Heal", "Select", "Close" ), 1;
 
+	if ( checkpointid == g_Checkpoints[ CP_AIRPORT_LV ] || checkpointid == g_Checkpoints[ CP_AIRPORT_SF ] || checkpointid == g_Checkpoints[ CP_AIRPORT_LS ] )
+		return ShowPlayerAirportMenu( playerid );
+
 	if ( checkpointid == g_Checkpoints[ CP_VEHDEALER ] || checkpointid == g_Checkpoints[ CP_VEHDEALER_2 ] || checkpointid == g_Checkpoints[ CP_VEHDEALER_3 ] )
 		return ShowBuyableVehiclesList( playerid );
 
@@ -19159,12 +19168,12 @@ public OnPlayerEnterDynamicCP(playerid, checkpointid)
 	    	if ( iDetained )
 	    	{
 				if ( iCashEarned > 30000 )
-					printf("[police dropoff] %s -> %d people - %s", ReturnPlayerName( playerid ), iDetained, ConvertPrice( iCashEarned ) ); // 8hska7082bmahu
+					printf("[police dropoff] %s -> %d people - %s", ReturnPlayerName( playerid ), iDetained, number_format( iCashEarned ) ); // 8hska7082bmahu
 
 				GivePlayerCash( playerid, iCashEarned );
 				GivePlayerScore( playerid, iDetained * 2 );
 				CallLocalFunction( "OnPlayerArrest", "dddd", playerid, INVALID_PLAYER_ID, p_Arrests[ playerid ], iDetained );
-	    		return SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[ACHIEVE]{FFFFFF} You have earned "COL_GOLD"%s{FFFFFF} and %d score for dropping off %d criminal(s) to prison.", ConvertPrice( iCashEarned ), iDetained * 2, iDetained );
+	    		return SendClientMessageFormatted( playerid, -1, ""COL_GREEN"[ACHIEVE]{FFFFFF} You have earned "COL_GOLD"%s{FFFFFF} and %d score for dropping off %d criminal(s) to prison.", number_format( iCashEarned ), iDetained * 2, iDetained );
 	    	}
 	    	else return SendError( playerid, "There are no detained criminals in your vehicle that can be jailed." );
 	    }
@@ -19299,7 +19308,7 @@ public OnPlayerEnterDynamicCP(playerid, checkpointid)
 						GivePlayerScore( playerid, 2 );
 						Achievement::HandleCarJacked( playerid );
 						SetTimerEx( "ExportVehicle", 3000, false, "dd", iVehicle, i );
-						SendServerMessage( playerid, "You have exported your "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", GetVehicleName( GetVehicleModel( iVehicle ) ), ConvertPrice( iCash ) );
+						SendServerMessage( playerid, "You have exported your "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", GetVehicleName( GetVehicleModel( iVehicle ) ), number_format( iCash ) );
 						break;
 					}
 				}
@@ -19440,7 +19449,7 @@ public OnPlayerEnterDynamicRaceCP( playerid, checkpointid )
 			//SetTimerEx( "RespawnVehicle", 3500, false, "d", GetVehicleTrailer( iVehicle ) );
 			DetachTrailerFromVehicle( iVehicle );
 
-			ShowPlayerHelpDialog( playerid, 7500, "You have earned ~y~~h~%s~w~~h~ for exporting %s!", ConvertPrice( iCashEarned ), g_aTrailerData[ p_TruckingTrailerModel{ playerid } ] [ p_TruckingTrailer{ playerid } ] [ E_NAME ] );
+			ShowPlayerHelpDialog( playerid, 7500, "You have earned ~y~~h~%s~w~~h~ for exporting %s!", number_format( iCashEarned ), g_aTrailerData[ p_TruckingTrailerModel{ playerid } ] [ p_TruckingTrailer{ playerid } ] [ E_NAME ] );
         	return ( p_TruckingRoute[ playerid ] { 1 } = INVALID_TRUCKING_ROUTE ), 1;
 		}
 		return 1;
@@ -19472,7 +19481,7 @@ public OnPlayerEnterDynamicRaceCP( playerid, checkpointid )
 			p_PawnStoreExport[ playerid ] = 0xFFFF;
 			GivePlayerCash( playerid, cashEarned );
 			GivePlayerWantedLevel( playerid, items * 2 );
-			SendServerMessage( playerid, "You have sold %d furniture item(s) to the Pawn Store, earning you "COL_GOLD"%s"COL_WHITE".", GetGVarInt( szItems ), ConvertPrice( cashEarned ) );
+			SendServerMessage( playerid, "You have sold %d furniture item(s) to the Pawn Store, earning you "COL_GOLD"%s"COL_WHITE".", GetGVarInt( szItems ), number_format( cashEarned ) );
 			DeleteGVar( szItems );
 		}
 		return 1;
@@ -19499,7 +19508,7 @@ public OnPlayerEnterDynamicRaceCP( playerid, checkpointid )
 			p_MiningExport[ playerid ] = 0xFFFF;
 			GivePlayerCash( playerid, cashEarned );
 			GivePlayerScore( playerid, floatround( oresExported / 2 ) ); // 16 score is a bit too much for ore... so half that = 8
-			SendServerMessage( playerid, "You have exported %d rock ore(s) to an industry, earning you "COL_GOLD"%s"COL_WHITE".", oresExported, ConvertPrice( cashEarned ) );
+			SendServerMessage( playerid, "You have exported %d rock ore(s) to an industry, earning you "COL_GOLD"%s"COL_WHITE".", oresExported, number_format( cashEarned ) );
 		}
 		return 1;
 	}
@@ -19522,7 +19531,7 @@ public OnPlayerEnterDynamicRaceCP( playerid, checkpointid )
 	    new cash = floatround( fDistance ) + 5000;
         DestroyDynamicRaceCP( p_LumberjackDeliver[ playerid ] );
         p_LumberjackDeliver[ playerid ] = 0xFFFF;
-		ShowPlayerHelpDialog( playerid, 7500, "Great job! You've earned ~y~%s~w~~h~!~n~~n~Navigate to the import location to pack your truck with logs.~n~~n~~y~~h~Info: The truck blip has been updated, navigate to it.", ConvertPrice( cash ) );
+		ShowPlayerHelpDialog( playerid, 7500, "Great job! You've earned ~y~%s~w~~h~!~n~~n~Navigate to the import location to pack your truck with logs.~n~~n~~y~~h~Info: The truck blip has been updated, navigate to it.", number_format( cash ) );
         //SendServerMessage( playerid, "You've made "COL_GOLD"%s"COL_WHITE" from exporting. Go and pick another box up!"  );
 	    GivePlayerCash( playerid, cash );
 	    GivePlayerScore( playerid, 5 );
@@ -19727,9 +19736,9 @@ public OnPlayerUseSlotMachine( playerid, slotid, first_combo, second_combo, thir
 
 		// alert user
 		if ( iNetWin >= 10000 ) {
-   			SendGlobalMessage( -1, ""COL_GREY"[CASINO]{FFFFFF} %s(%d) has won "COL_GOLD"%s"COL_WHITE" from the %s casino slots!", ReturnPlayerName( playerid ), playerid, ConvertPrice( iNetWin ), g_slotmachineData[ slotid ] [ E_ENTRY_FEE ] == 10000 ? ( "Four Dragons" ) : ( g_slotmachineData[ slotid ] [ E_ENTRY_FEE ] == 25000 ? ( "Visage" ) : ( "Caligulas" ) ) );
+   			SendGlobalMessage( -1, ""COL_GREY"[CASINO]{FFFFFF} %s(%d) has won "COL_GOLD"%s"COL_WHITE" from the %s casino slots!", ReturnPlayerName( playerid ), playerid, number_format( iNetWin ), g_slotmachineData[ slotid ] [ E_ENTRY_FEE ] == 10000 ? ( "Four Dragons" ) : ( g_slotmachineData[ slotid ] [ E_ENTRY_FEE ] == 25000 ? ( "Visage" ) : ( "Caligulas" ) ) );
    		} else {
-   			SendServerMessage( playerid, "Congratulations, you've won "COL_GOLD"%s"COL_WHITE"!", ConvertPrice( iNetWin ) );
+   			SendServerMessage( playerid, "Congratulations, you've won "COL_GOLD"%s"COL_WHITE"!", number_format( iNetWin ) );
    		}
 
 		// give the cash
@@ -19835,8 +19844,8 @@ public OnPlayerPickUpDynamicPickup( playerid, pickupid )
 			    Get2DCity				( szCity, X, Y, Z );
 			    GetZoneFromCoordinates	( szLocation, X, Y, Z );
 
-				SendGlobalMessage( -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" %s(%d) has robbed "COL_GOLD"%s"COL_WHITE" from an ATM near %s in %s!", ReturnPlayerName( playerid ), playerid, ConvertPrice( iLoot ), szLocation, szCity );
-				return SendServerMessage( playerid, "You have successfully taken "COL_GOLD"%s"COL_WHITE" dispensed from the ATM.", ConvertPrice( iLoot ) );
+				SendGlobalMessage( -1, ""COL_GOLD"[ROBBERY]"COL_WHITE" %s(%d) has robbed "COL_GOLD"%s"COL_WHITE" from an ATM near %s in %s!", ReturnPlayerName( playerid ), playerid, number_format( iLoot ), szLocation, szCity );
+				return SendServerMessage( playerid, "You have successfully taken "COL_GOLD"%s"COL_WHITE" dispensed from the ATM.", number_format( iLoot ) );
 			}
 		}
 
@@ -20377,7 +20386,7 @@ public OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
 						TextDrawSetString( g_SlotMachineThreeTD[ id ], g_slotmachineColors[ floatround( floatfract( g_slotmachineData[ id ] [ E_SPIN_ROTATE ] [ 2 ] / 360 ) * 18 ) ] );
 						TextDrawShowForPlayer( playerid, g_SlotMachineThreeTD[ id ] );
 
-						TextDrawSetString( p_SlotMachineFigureTD[ id ], sprintf( "~y~~h~%s", ConvertPrice( g_slotmachineData[ id ] [ E_ENTRY_FEE ] ) ) );
+						TextDrawSetString( p_SlotMachineFigureTD[ id ], sprintf( "~y~~h~%s", number_format( g_slotmachineData[ id ] [ E_ENTRY_FEE ] ) ) );
 						TextDrawShowForPlayer( playerid, p_SlotMachineFigureTD[ id ] );
 
 						TextDrawShowForPlayer( playerid, g_SlotMachineBoxTD[ 0 ] );
@@ -20515,7 +20524,7 @@ public OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
 			}
 			else
 			{
-				if (	GetGVarType( "meth_chef", vehicleid ) != GLOBAL_VARTYPE_NONE && IsPlayerConnected( GetGVarInt( "meth_chef", vehicleid ) ) && GetGVarType( "meth_cooktimer", vehicleid ) == GLOBAL_VARTYPE_NONE && !p_ProgressStarted{ playerid } )
+				if ( GetGVarType( "meth_chef", vehicleid ) != GLOBAL_VARTYPE_NONE && IsPlayerConnected( GetGVarInt( "meth_chef", vehicleid ) ) && GetGVarType( "meth_cooktimer", vehicleid ) == GLOBAL_VARTYPE_NONE && !p_ProgressStarted{ playerid } )
 				{
 					if ( IsPlayerAimingAt( playerid, 1477.07068, 1464.22253, 1011.95422, fAimDistance ) )
 					{
@@ -21285,6 +21294,7 @@ thread OnPlayerLogin( playerid, password[ ] )
 			p_BusinessSpawnLocation[ playerid ] = cache_get_field_content_int( 0, "BUSINESS_ID", dbHandle );
 			p_CasinoRewardsPoints[ playerid ] = cache_get_field_content_float( 0, "CASINO_REWARDS", dbHandle );
 			p_IsCasinoHighRoller{ playerid } = !!cache_get_field_content_int( 0, "VISAGE_HIGHROLLER", dbHandle );
+			p_Fireworks[ playerid ] = cache_get_field_content_int( 0, "FIREWORKS", dbHandle );
 
 			if ( p_forcedAnticheat[ playerid ] > 0 && ! IsPlayerUsingSampAC( playerid ) ) {
 				SendError( playerid, "You must install an anticheat to play the server. Visit "COL_GREY"www.samp-ac.com"COL_WHITE" to install the anticheat." );
@@ -21626,7 +21636,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				if ( p_C4Amount[ playerid ] + 5 > MAX_C4 )
 				{
 				    new amount = MAX_C4 - p_C4Amount[ playerid ];
-					SendServerMessage( playerid, "You have bought %d C4(s) for "COL_GOLD"%s"COL_WHITE" as adding five would exceed the C4 limit.", MAX_C4 - p_C4Amount[ playerid ], ConvertPrice( amount * 495 ) );
+					SendServerMessage( playerid, "You have bought %d C4(s) for "COL_GOLD"%s"COL_WHITE" as adding five would exceed the C4 limit.", MAX_C4 - p_C4Amount[ playerid ], number_format( amount * 495 ) );
 					p_C4Amount[ playerid ] += amount;
 				    GivePlayerCash( playerid, -( amount * 495 ) );
 				}
@@ -21666,32 +21676,32 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 		{
             case 0:
             {
-                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your bank account.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( p_BankMoney[ playerid ] ) );
+                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your bank account.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( p_BankMoney[ playerid ] ) );
                 ShowPlayerDialog(playerid, DIALOG_BANK_WITHDRAW, DIALOG_STYLE_INPUT, "{FFFFFF}Personal Account", Query, "Withdraw", "Back");
             }
             case 1:
             {
-                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your bank account below.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( p_BankMoney[ playerid ] ) );
+                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your bank account below.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( p_BankMoney[ playerid ] ) );
                 ShowPlayerDialog(playerid, DIALOG_BANK_DEPOSIT, DIALOG_STYLE_INPUT, "{FFFFFF}Personal Account", Query, "Deposit", "Back");
             }
             case 2:
             {
-                format( Query, sizeof( Query ), ""COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", ConvertPrice( p_BankMoney[ playerid ] ), ConvertPrice( GetPlayerCash( playerid ) ) );
+                format( Query, sizeof( Query ), ""COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", number_format( p_BankMoney[ playerid ] ), number_format( GetPlayerCash( playerid ) ) );
                 ShowPlayerDialog(playerid, DIALOG_BANK_INFO, DIALOG_STYLE_MSGBOX, "{FFFFFF}Personal Account", Query, "Ok", "Back");
             }
             case 3:
             {
-                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your gang bank account.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ) );
+                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your gang bank account.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( g_gangData[ gangid ] [ E_BANK ] ) );
                 ShowPlayerDialog(playerid, DIALOG_GANG_BANK_WITHDRAW, DIALOG_STYLE_INPUT, "{FFFFFF}Gang Account", Query, "Withdraw", "Back");
             }
             case 4:
             {
-                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your gang bank account below.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ) );
+                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your gang bank account below.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( g_gangData[ gangid ] [ E_BANK ] ) );
                 ShowPlayerDialog(playerid, DIALOG_GANG_BANK_DEPOSIT, DIALOG_STYLE_INPUT, "{FFFFFF}Gang Account", Query, "Deposit", "Back");
             }
             case 5:
             {
-                format( Query, sizeof( Query ), ""COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ), ConvertPrice( GetPlayerCash( playerid ) ) );
+                format( Query, sizeof( Query ), ""COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", number_format( g_gangData[ gangid ] [ E_BANK ] ), number_format( GetPlayerCash( playerid ) ) );
                 ShowPlayerDialog(playerid, DIALOG_GANG_BANK_INFO, DIALOG_STYLE_MSGBOX, "{FFFFFF}Gang Account", Query, "Ok", "Back");
             }
         }
@@ -21703,27 +21713,27 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 		{
             if (!strlen(inputtext))
 			{
-			    format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your bank account.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( p_BankMoney[ playerid ] ) );
+			    format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your bank account.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( p_BankMoney[ playerid ] ) );
                 ShowPlayerDialog(playerid, DIALOG_BANK_WITHDRAW, DIALOG_STYLE_INPUT, "{FFFFFF}Personal Account", Query, "Withdraw", "Back");
             }
             else if (!IsNumeric(inputtext)) {
-                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your bank account.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( p_BankMoney[ playerid ] ) );
+                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your bank account.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( p_BankMoney[ playerid ] ) );
                 ShowPlayerDialog(playerid, DIALOG_BANK_WITHDRAW, DIALOG_STYLE_INPUT, "{FFFFFF}Personal Account", Query, "Withdraw", "Back");
             }
             else if ( strval( inputtext ) > 99999999 || strval( inputtext ) < 0 )
             {
-                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your bank account.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( p_BankMoney[ playerid ] ) );
+                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your bank account.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( p_BankMoney[ playerid ] ) );
                 ShowPlayerDialog(playerid, DIALOG_BANK_WITHDRAW, DIALOG_STYLE_INPUT, "{FFFFFF}Personal Account", Query, "Withdraw", "Back");
             }
             else if (strval(inputtext) > p_BankMoney[ playerid ]) {
-                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your bank account.\n\n"COL_RED"Insufficient balance, therefore withdrawal failed.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( p_BankMoney[ playerid ] ) );
+                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your bank account.\n\n"COL_RED"Insufficient balance, therefore withdrawal failed.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( p_BankMoney[ playerid ] ) );
                 ShowPlayerDialog(playerid, DIALOG_BANK_WITHDRAW, DIALOG_STYLE_INPUT, "{FFFFFF}Personal Account", Query, "Withdraw", "Back");
             }
             else {
             	new iWithdraw = strval( inputtext );
                 p_BankMoney[ playerid ] -= iWithdraw;
                 GivePlayerCash( playerid, iWithdraw );
-                format( Query, sizeof( Query ), ""COL_GREY"Amount Withdrawn:"COL_WHITE" %s\n"COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", ConvertPrice( iWithdraw ), ConvertPrice( p_BankMoney[ playerid ] ), ConvertPrice( GetPlayerCash( playerid ) ) );
+                format( Query, sizeof( Query ), ""COL_GREY"Amount Withdrawn:"COL_WHITE" %s\n"COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", number_format( iWithdraw ), number_format( p_BankMoney[ playerid ] ), number_format( GetPlayerCash( playerid ) ) );
                 ShowPlayerDialog( playerid, DIALOG_BANK_INFO, DIALOG_STYLE_MSGBOX, "{FFFFFF}Personal Account", Query, "Ok", "Back" );
             }
         }
@@ -21734,27 +21744,27 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 	    if ( IsPlayerJailed( playerid ) ) return SendError( playerid, "You cannot use this while you're in jail." );
         if (response) {
             if (!strlen(inputtext)) {
-                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your bank account below.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( p_BankMoney[ playerid ] ) );
+                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your bank account below.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( p_BankMoney[ playerid ] ) );
                 ShowPlayerDialog(playerid, DIALOG_BANK_DEPOSIT, DIALOG_STYLE_INPUT, "{FFFFFF}Personal Account", Query, "Deposit", "Back");
             }
             else if (!IsNumeric(inputtext)) {
-                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your bank account below.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( p_BankMoney[ playerid ] ) );
+                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your bank account below.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( p_BankMoney[ playerid ] ) );
                 ShowPlayerDialog(playerid, DIALOG_BANK_DEPOSIT, DIALOG_STYLE_INPUT, "{FFFFFF}Personal Account", Query, "Deposit", "Back");
             }
             else if (strval(inputtext) > GetPlayerCash( playerid )) {
-                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your bank account below.\n\n"COL_RED"Insufficient balance, therefore deposition failed.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( p_BankMoney[ playerid ] ) );
+                format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your bank account below.\n\n"COL_RED"Insufficient balance, therefore deposition failed.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( p_BankMoney[ playerid ] ) );
                 ShowPlayerDialog(playerid, DIALOG_BANK_DEPOSIT, DIALOG_STYLE_INPUT, "{FFFFFF}Personal Account", Query, "Deposit", "Back");
             }
             else if ( strval( inputtext ) > 99999999 || strval( inputtext ) < 0 )
             {
-            	format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your bank account below.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( p_BankMoney[ playerid ] ) );
+            	format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your bank account below.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( p_BankMoney[ playerid ] ) );
                 ShowPlayerDialog( playerid, DIALOG_BANK_DEPOSIT, DIALOG_STYLE_INPUT, "{FFFFFF}Personal Account", Query, "Deposit", "Back" );
             }
             else {
             	new iDeposit = strval( inputtext );
                 p_BankMoney[ playerid ] += iDeposit;
                 GivePlayerCash( playerid, -iDeposit );
-                format( Query, sizeof( Query ), ""COL_GREY"Amount Deposited:"COL_WHITE" %s\n"COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", ConvertPrice( iDeposit ), ConvertPrice( p_BankMoney[ playerid ] ), ConvertPrice( GetPlayerCash( playerid ) ) );
+                format( Query, sizeof( Query ), ""COL_GREY"Amount Deposited:"COL_WHITE" %s\n"COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", number_format( iDeposit ), number_format( p_BankMoney[ playerid ] ), number_format( GetPlayerCash( playerid ) ) );
                 ShowPlayerDialog( playerid, DIALOG_BANK_INFO, DIALOG_STYLE_MSGBOX, "{FFFFFF}Personal Account", Query, "Ok", "Back" );
             }
         }
@@ -21788,17 +21798,17 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 
 	    if ( sscanf( inputtext, "d", iWithdraw ) )
 	    {
-		    format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your gang bank account.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ) );
+		    format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your gang bank account.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( g_gangData[ gangid ] [ E_BANK ] ) );
             ShowPlayerDialog(playerid, DIALOG_GANG_BANK_WITHDRAW, DIALOG_STYLE_INPUT, "{FFFFFF}Gang Account", Query, "Withdraw", "Back");
 	    }
         else if ( iWithdraw > 99999999 || iWithdraw < 0 )
         {
-            format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your gang bank account.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ) );
+            format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your gang bank account.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( g_gangData[ gangid ] [ E_BANK ] ) );
             ShowPlayerDialog(playerid, DIALOG_GANG_BANK_WITHDRAW, DIALOG_STYLE_INPUT, "{FFFFFF}Gang Account", Query, "Withdraw", "Back");
         }
         else if ( iWithdraw > g_gangData[ gangid ] [ E_BANK ] )
         {
-            format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your gang bank account.\n\n"COL_RED"Insufficient balance, therefore withdrawal failed.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ) );
+            format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to withdraw from your gang bank account.\n\n"COL_RED"Insufficient balance, therefore withdrawal failed.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( g_gangData[ gangid ] [ E_BANK ] ) );
             ShowPlayerDialog(playerid, DIALOG_GANG_BANK_WITHDRAW, DIALOG_STYLE_INPUT, "{FFFFFF}Gang Account", Query, "Withdraw", "Back");
         }
         else
@@ -21815,8 +21825,8 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 	     	mysql_single_query( szNormalString );
 
 	     	// withdraw
-            SendClientMessageToGang( gangid, g_gangData[ gangid ] [ E_COLOR ], "[GANG]"COL_GREY" %s(%d) has withdrawn %s (inc. 10%s fee) from the gang bank account.", ReturnPlayerName( playerid ), playerid, ConvertPrice( iAfterTax ), "%%" );
-            format( Query, sizeof( Query ), ""COL_GREY"Amount Withdrawn:"COL_WHITE" %s\n"COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", ConvertPrice( iWithdraw ), ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ), ConvertPrice( GetPlayerCash( playerid ) ) );
+            SendClientMessageToGang( gangid, g_gangData[ gangid ] [ E_COLOR ], "[GANG]"COL_GREY" %s(%d) has withdrawn %s (inc. 10%s fee) from the gang bank account.", ReturnPlayerName( playerid ), playerid, number_format( iAfterTax ), "%%" );
+            format( Query, sizeof( Query ), ""COL_GREY"Amount Withdrawn:"COL_WHITE" %s\n"COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", number_format( iWithdraw ), number_format( g_gangData[ gangid ] [ E_BANK ] ), number_format( GetPlayerCash( playerid ) ) );
             ShowPlayerDialog( playerid, DIALOG_GANG_BANK_INFO, DIALOG_STYLE_MSGBOX, "{FFFFFF}Gang Account", Query, "Ok", "Back" );
         }
         return 1;
@@ -21842,17 +21852,17 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 
         if ( sscanf( inputtext, "d", iDeposit ) )
         {
-            format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your gang bank account below.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ) );
+            format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your gang bank account below.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( g_gangData[ gangid ] [ E_BANK ] ) );
             ShowPlayerDialog(playerid, DIALOG_GANG_BANK_DEPOSIT, DIALOG_STYLE_INPUT, "{FFFFFF}Gang Account", Query, "Deposit", "Back");
         }
         else if ( iDeposit > 99999999 || iDeposit < 1 )
         {
-        	format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your gang bank account below.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ) );
+        	format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your gang bank account below.\n\n"COL_RED"Invalid amount entered!\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( g_gangData[ gangid ] [ E_BANK ] ) );
             ShowPlayerDialog( playerid, DIALOG_GANG_BANK_DEPOSIT, DIALOG_STYLE_INPUT, "{FFFFFF}Gang Account", Query, "Deposit", "Back" );
         }
         else if ( iDeposit > GetPlayerCash( playerid ) )
         {
-            format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your gang bank account below.\n\n"COL_RED"Insufficient balance, therefore deposition failed.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ) );
+            format( Query, sizeof( Query ), "{FFFFFF}Enter the amount that you are willing to deposit into your gang bank account below.\n\n"COL_RED"Insufficient balance, therefore deposition failed.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( g_gangData[ gangid ] [ E_BANK ] ) );
             ShowPlayerDialog(playerid, DIALOG_GANG_BANK_DEPOSIT, DIALOG_STYLE_INPUT, "{FFFFFF}Gang Account", Query, "Deposit", "Back");
         }
         else
@@ -21866,8 +21876,8 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 	     	mysql_single_query( szNormalString );
 
 	     	// deposit
-            SendClientMessageToGang( gangid, g_gangData[ gangid ] [ E_COLOR ], "[GANG]"COL_GREY" %s(%d) has deposited %s into the gang bank account.", ReturnPlayerName( playerid ), playerid, ConvertPrice( iDeposit ) );
-            format( Query, sizeof( Query ), ""COL_GREY"Amount Deposited:"COL_WHITE" %s\n"COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", ConvertPrice( iDeposit ), ConvertPrice( g_gangData[ gangid ] [ E_BANK ] ), ConvertPrice( GetPlayerCash( playerid ) ) );
+            SendClientMessageToGang( gangid, g_gangData[ gangid ] [ E_COLOR ], "[GANG]"COL_GREY" %s(%d) has deposited %s into the gang bank account.", ReturnPlayerName( playerid ), playerid, number_format( iDeposit ) );
+            format( Query, sizeof( Query ), ""COL_GREY"Amount Deposited:"COL_WHITE" %s\n"COL_GREY"Current Balance:"COL_WHITE" %s\n"COL_GREY"Current Money:{FFFFFF} %s", number_format( iDeposit ), number_format( g_gangData[ gangid ] [ E_BANK ] ), number_format( GetPlayerCash( playerid ) ) );
             ShowPlayerDialog( playerid, DIALOG_GANG_BANK_INFO, DIALOG_STYLE_MSGBOX, "{FFFFFF}Gang Account", Query, "Ok", "Back" );
         }
         return 1;
@@ -22132,7 +22142,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 					if ( g_houseInteriors[ intid ] [ E_COST ] > GetPlayerCash( playerid ) )
 					{
 						ShowPlayerDialog( playerid, DIALOG_HOUSE_INT_CONFIRM, DIALOG_STYLE_LIST, "{FFFFFF}House Interiors", "Purchase House Interior\nPreview House Interior", "Select", "Back" );
-						SendError( playerid, "This interior costs "COL_GOLD"%s"COL_WHITE". You don't have this amount.", ConvertPrice( g_houseInteriors[ intid ] [ E_COST ] ) );
+						SendError( playerid, "This interior costs "COL_GOLD"%s"COL_WHITE". You don't have this amount.", number_format( g_houseInteriors[ intid ] [ E_COST ] ) );
 					}
 					else if ( g_houseInteriors[ intid ] [ E_VIP ] && !p_VIPLevel[ playerid ] )
 					{
@@ -22153,7 +22163,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 					    GivePlayerCash( playerid, -( g_houseInteriors[ intid ] [ E_COST ] ) );
 
 					    if ( intid != 0 )
-							SendServerMessage( playerid, "You have purchased a %s for "COL_GOLD"%s"COL_WHITE". This has been applied to the House ID %d.", g_houseInteriors[ intid ] [ E_NAME ], ConvertPrice( g_houseInteriors[ intid ] [ E_COST ] ), houseid );
+							SendServerMessage( playerid, "You have purchased a %s for "COL_GOLD"%s"COL_WHITE". This has been applied to the House ID %d.", g_houseInteriors[ intid ] [ E_NAME ], number_format( g_houseInteriors[ intid ] [ E_COST ] ), houseid );
 						else
 						    SendServerMessage( playerid, "You have successfully reset your interior to the default interior." );
 
@@ -22188,7 +22198,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				    SetPlayerInterior( playerid, g_houseInteriors[ intid ] [ E_INTERIOR_ID ] );
 					InterpolateCameraPos( playerid, g_houseInteriors[ intid ] [ E_PREVIEW_POS ] [ 0 ], g_houseInteriors[ intid ] [ E_PREVIEW_POS ] [ 1 ], g_houseInteriors[ intid ] [ E_PREVIEW_POS ] [ 2 ] + 1.5, g_houseInteriors[ intid ] [ E_PREVIEW_LOOKAT ] [ 0 ], g_houseInteriors[ intid ] [ E_PREVIEW_LOOKAT ] [ 1 ], g_houseInteriors[ intid ] [ E_PREVIEW_LOOKAT ] [ 2 ], 15000, CAMERA_MOVE );
 					InterpolateCameraLookAt( playerid, g_houseInteriors[ intid ] [ E_PREVIEW_LOOKAT ] [ 0 ], g_houseInteriors[ intid ] [ E_PREVIEW_LOOKAT ] [ 1 ], g_houseInteriors[ intid ] [ E_PREVIEW_LOOKAT ] [ 2 ], g_houseInteriors[ intid ] [ E_PREVIEW_POS ] [ 0 ], g_houseInteriors[ intid ] [ E_PREVIEW_POS ] [ 1 ], g_houseInteriors[ intid ] [ E_PREVIEW_POS ] [ 2 ] + 1.5, 15000, CAMERA_MOVE );
-					SendServerMessage( playerid, "You are now previewing "COL_GREY"%s "COL_GOLD"%s"COL_WHITE". Press your enter key to stop.", g_houseInteriors[ intid ] [ E_NAME ], ConvertPrice( g_houseInteriors[ intid ] [ E_COST ] ) );
+					SendServerMessage( playerid, "You are now previewing "COL_GREY"%s "COL_GOLD"%s"COL_WHITE". Press your enter key to stop.", g_houseInteriors[ intid ] [ E_NAME ], number_format( g_houseInteriors[ intid ] [ E_COST ] ) );
 					SetPVarInt( playerid, "viewing_houseints", 1 );
 				}
 			}
@@ -22215,7 +22225,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 			format( g_houseData[ houseid ] [ E_HOUSE_NAME ], 30, "%s", inputtext);
 			format( Query, sizeof( Query ), "UPDATE `HOUSES` SET NAME='%s' WHERE ID=%d", mysql_escape( g_houseData[ houseid ] [ E_HOUSE_NAME ] ), p_InHouse[ playerid ] );
 			mysql_single_query( Query );
-			format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", g_houseData[ houseid ] [ E_HOUSE_NAME ], houseid, g_houseData[ houseid ] [ E_OWNER ], ConvertPrice( g_houseData[ houseid ] [ E_COST ] ) );
+			format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", g_houseData[ houseid ] [ E_HOUSE_NAME ], houseid, g_houseData[ houseid ] [ E_OWNER ], number_format( g_houseData[ houseid ] [ E_COST ] ) );
  			UpdateDynamic3DTextLabelText( g_houseData[ houseid ] [ E_LABEL ] [ 0 ], COLOR_WHITE, szBigString );
  			SendServerMessage( playerid, "You have successfully changed the name of your house." );
  			cmd_h( playerid, "config" );
@@ -22416,7 +22426,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 			{
 				new iPlayers = GetOnlineGangMembers( g );
 				format( szLargeString, 350, ""COL_GREY"Gang ID:"COL_WHITE" %d\n"COL_GREY"Online Members:"COL_WHITE" %d\n"COL_GREY"Score:"COL_WHITE" %d\n"COL_GREY"Kills:"COL_WHITE" %d\n"COL_GREY"Deaths:"COL_WHITE" %d\n"COL_GREY"K/D Ratio:"COL_WHITE" %0.2f\n", g_gangData[ g ] [ E_SQL_ID ], iPlayers, g_gangData[ g ] [ E_SCORE ], g_gangData[ g ] [ E_KILLS ], g_gangData[ g ] [ E_DEATHS ], floatdiv( g_gangData[ g ] [ E_KILLS ], g_gangData[ g ] [ E_DEATHS ] ) );
-				format( szLargeString, 350, "%s"COL_GREY"Bank:"COL_WHITE" %s\n"COL_GREY"Zones Captured:"COL_WHITE" %d", szLargeString, ConvertPrice( g_gangData[ g ] [ E_BANK ] ), GetGangCapturedTurfs( g ) );
+				format( szLargeString, 350, "%s"COL_GREY"Bank:"COL_WHITE" %s\n"COL_GREY"Zones Captured:"COL_WHITE" %d", szLargeString, number_format( g_gangData[ g ] [ E_BANK ] ), GetGangCapturedTurfs( g ) );
 				ShowPlayerDialog( playerid, DIALOG_GANG_LIST_RESPONSE, DIALOG_STYLE_MSGBOX, "{FFFFFF}Gang Statistics", szLargeString, "Close", "Back" );
 			}
 			case 1: mysql_function_query( dbHandle, sprintf( "SELECT `NAME`,`ONLINE` FROM `USERS` WHERE `GANG_ID`=%d ORDER BY `ONLINE` DESC", g_gangData[ g ] [ E_SQL_ID ] ), true, "OnListGangMembers", "dd", playerid, g ); // View gang members
@@ -22537,14 +22547,11 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 	    	new Float: rewards_points = g_casinoRewardsItems[ rewards_item ] [ E_POINTS ];
 
     		if ( p_CasinoRewardsPoints[ playerid ] < rewards_points )
-    			return SendError( playerid, "You need %0.2f more rewards points for this item.", rewards_points );
+    			return SendError( playerid, "You need %s rewards points for this item.", number_format( rewards_points, .prefix = '\0' ) );
 
     		switch ( rewards_item )
     		{
-    			case 0: // fireworks
-    			{
-    				return SendError( playerid, "Work In Progress." );
-    			}
+    			case 0: GivePlayerFireworks( playerid, 1 ); // fireworks
     			case 1: // highroller
     			{
     				if ( p_IsCasinoHighRoller{ playerid } ) return SendError( playerid, "You are already considered a casino highroller." );
@@ -22557,7 +22564,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 
     		p_CasinoRewardsPoints[ playerid ] -= rewards_points;
 			mysql_single_query( sprintf( "UPDATE `USERS` SET `CASINO_REWARDS` = %f WHERE `ID`=%d", p_CasinoRewardsPoints[ playerid ], p_AccountID[ playerid ] ) );
-			SendServerMessage( playerid, "You have bought "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%0.2f"COL_WHITE" rewards points.", g_casinoRewardsItems[ rewards_item ] [ E_NAME ], rewards_points );
+			SendServerMessage( playerid, "You have bought "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE" rewards points.", g_casinoRewardsItems[ rewards_item ] [ E_NAME ], number_format( rewards_points, .prefix = '\0' ) );
     		return ShowPlayerRewardsMenu( playerid );
 	    }
 	    else
@@ -22569,7 +22576,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 		    		new Float: rewards_cost = ( float( g_shopItemData[ i ] [ E_PRICE ] ) * CASINO_REWARDS_COST_MP ) / CASINO_REWARDS_DIVISOR;
 
 		    		if ( p_CasinoRewardsPoints[ playerid ] < rewards_cost )
-		    			return SendError( playerid, "You need %0.2f more rewards points for this item.", rewards_cost );
+		    			return SendError( playerid, "You need %s rewards points for this item.", number_format( rewards_cost, .prefix = '\0' ) );
 
 		    		// shop limits
 		    		if ( g_shopItemData[ i ] [ E_LIMIT ] == LIMIT_ONE )
@@ -22597,7 +22604,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 		    		// deduct points
 					p_CasinoRewardsPoints[ playerid ] -= rewards_cost;
 					mysql_single_query( sprintf( "UPDATE `USERS` SET `CASINO_REWARDS` = %f WHERE `ID`=%d", p_CasinoRewardsPoints[ playerid ], p_AccountID[ playerid ] ) );
-					SendServerMessage( playerid, "You have bought 1x "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%0.2f"COL_WHITE" rewards points.", g_shopItemData[ i ] [ E_NAME ], rewards_cost );
+					SendServerMessage( playerid, "You have bought 1x "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE" rewards points.", g_shopItemData[ i ] [ E_NAME ], number_format( rewards_cost, .prefix = '\0' ) );
 		    		return ShowPlayerRewardsMenu( playerid );
 		    	}
 		    	x ++;
@@ -22643,7 +22650,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
         		}
         	}
 			GivePlayerCash( playerid, -( g_shopItemData[ i ] [ E_PRICE ] ) );
-			SendServerMessage( playerid, "You have bought a "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", g_shopItemData[ i ] [ E_NAME ], ConvertPrice( g_shopItemData[ i ] [ E_PRICE ] ) );
+			SendServerMessage( playerid, "You have bought a "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", g_shopItemData[ i ] [ E_NAME ], number_format( g_shopItemData[ i ] [ E_PRICE ] ) );
         }
         else
        	{
@@ -22685,7 +22692,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
     		else {
     			SetShopItemVariable( playerid, i, iCurrentQuantity + iAmount );
     			GivePlayerCash( playerid, -( g_shopItemData[ i ] [ E_PRICE ] * iAmount ) );
-				SendServerMessage( playerid, "You have bought %dx "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", iAmount, g_shopItemData[ i ] [ E_NAME ], ConvertPrice( g_shopItemData[ i ] [ E_PRICE ] * iAmount ) );
+				SendServerMessage( playerid, "You have bought %dx "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", iAmount, g_shopItemData[ i ] [ E_NAME ], number_format( g_shopItemData[ i ] [ E_PRICE ] * iAmount ) );
     		}
 
     		ShowPlayerDialog( playerid, DIALOG_SHOP_AMOUNT, DIALOG_STYLE_LIST, "{FFFFFF}Shop Items - Buy Quantity", "Buy 1\nBuy 5\nBuy Max", "Select", "Back" );
@@ -22702,8 +22709,8 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 
 		GivePlayerXP( playerid, -( strval( inputtext ) ) );
 		GivePlayerCash( playerid, strval( inputtext ) * EXCHANGE_XPCASH );
-		printf( "[xpmarket] %s -> %s", ReturnPlayerName( playerid ), ConvertPrice( strval( inputtext ) * EXCHANGE_XPCASH ) ); // 8hska7082bmahu
-		SendServerMessage( playerid, "You have successfully exchanged %d XP for %s dollars.", strval( inputtext ), ConvertPrice( strval( inputtext ) * EXCHANGE_XPCASH ) );
+		printf( "[xpmarket] %s -> %s", ReturnPlayerName( playerid ), number_format( strval( inputtext ) * EXCHANGE_XPCASH ) ); // 8hska7082bmahu
+		SendServerMessage( playerid, "You have successfully exchanged %d XP for %s dollars.", strval( inputtext ), number_format( strval( inputtext ) * EXCHANGE_XPCASH ) );
 	}
 	if ( ( dialogid == DIALOG_PAINTBALL ) && response )
 	{
@@ -23164,7 +23171,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				    unlockPlayerToy( playerid, g_ToyData[ id ] [ E_ID ] );
 				    GivePlayerCash( playerid, -g_ToyData[ id ] [ E_PRICE ] );
 					showToyCategoryItems( playerid, p_ToyCategorySelected{ playerid }, .pawnshop = true );
-		      		SendServerMessage( playerid, "You have bought a "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", g_ToyData[ id ] [ E_NAME ], ConvertPrice( g_ToyData[ id ] [ E_PRICE ] ) );
+		      		SendServerMessage( playerid, "You have bought a "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", g_ToyData[ id ] [ E_NAME ], number_format( g_ToyData[ id ] [ E_PRICE ] ) );
 		      		break;
 		   		}
 		      	x ++;
@@ -23548,7 +23555,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 											""COL_GREY"Kills:{FFFFFF} %d\n"\
 											""COL_GREY"Deaths:{FFFFFF} %d\n"\
 											""COL_GREY"Ratio (K/D):{FFFFFF} %0.2f\n",
-											GetPlayerScore( pID ), p_XP[ pID ], ConvertPrice( GetPlayerCash( pID ) ), ConvertPrice( p_BankMoney[ pID ] ), p_Kills[ pID ], p_Deaths[ pID ], floatdiv( p_Kills[ pID ], p_Deaths[ pID ] ) );
+											GetPlayerScore( pID ), p_XP[ pID ], number_format( GetPlayerCash( pID ) ), number_format( p_BankMoney[ pID ] ), p_Kills[ pID ], p_Deaths[ pID ], floatdiv( p_Kills[ pID ], p_Deaths[ pID ] ) );
 
 				format( szLargeString, 720,	"%s"COL_GREY"Owned Houses:{FFFFFF} %d (Limit %d)\n"\
 				                          	""COL_GREY"Owned Vehicles:{FFFFFF} %d (Limit %d)\n"\
@@ -23592,6 +23599,8 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 											""COL_GREY"Hydrogen Chloride:{FFFFFF} %d\n",
 											szLargeString, p_AntiEMP[ pID ], p_SecureWallet{ pID } == true ? ( "Yes" ) : ( "No" ), p_BobbyPins[ pID ], p_C4Amount[ pID ], p_AidsVaccine{ pID } == true ? ("Yes") : ("No"),
 											p_CausticSoda{ pID }, p_MuriaticAcid{ pID }, p_HydrogenChloride{ pID } );
+
+				format( szLargeString, 512, "%s"COL_GREY"Fireworks:{FFFFFF} %d\n", szLargeString, p_Fireworks[ playerid ] );
 				ShowPlayerDialog( playerid, DIALOG_STATS_REDIRECT, DIALOG_STYLE_MSGBOX, "{FFFFFF}Item Statistics", szLargeString, "Okay", "Back" );
 			}
 			case 3: displayStreaks( pID, DIALOG_STATS_REDIRECT, "Back", playerid );
@@ -23695,7 +23704,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				SetVehicleParamsEx( g_vehicleData[ playerid ] [ bID ] [ E_VEHICLE_ID ], VEHICLE_PARAMS_ON, lights, alarm, doors, bonnet, boot, objective );
 				PutPlayerInVehicle( playerid, g_vehicleData[ playerid ] [ bID ] [ E_VEHICLE_ID ], 0 );
 
-				SendServerMessage( playerid, "You have bought an "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE"!", g_BuyableVehicleData[ data_id ] [ E_NAME ], ConvertPrice( g_BuyableVehicleData[ data_id ] [ E_PRICE ] )  );
+				SendServerMessage( playerid, "You have bought an "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE"!", g_BuyableVehicleData[ data_id ] [ E_NAME ], number_format( g_BuyableVehicleData[ data_id ] [ E_PRICE ] )  );
 				ShowPlayerDialog( playerid, DIALOG_BOUGHT_VEH, DIALOG_STYLE_MSGBOX, "{FFFFFF}You've purchased a vehicle!", "{FFFFFF}Glad to see you've purchased a vehicle. Please ensure you read:\n\n* Vehicles are kept until you sell them or go two months inactive. This is not refundable.\n* Do not mispark your vehicle or it can be removed/impounded.\n* Check out /v for vehicle commands.\n* Find an acceptable place to park your new vehicle such as your house or a parking lot.", "Okay", "" );
 				SetPVarInt( playerid, "bought_veh_ts", g_iTime + 30 );
 			}
@@ -24012,9 +24021,9 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 							return 1;
 						}
 						GivePlayerCash( weapondealerid, floatround( price * 0.75 ) );
-		                SendClientMessageFormatted( weapondealerid, -1, ""COL_ORANGE"[WEAPON DEAL]{FFFFFF} %s(%d) has purchased a %s for "COL_GOLD"%s"COL_WHITE" (tax applied).", ReturnPlayerName( playerid ), playerid, g_AmmunationWeapons[ i ] [ E_NAME ], ConvertPrice( price ) );
+		                SendClientMessageFormatted( weapondealerid, -1, ""COL_ORANGE"[WEAPON DEAL]{FFFFFF} %s(%d) has purchased a %s for "COL_GOLD"%s"COL_WHITE" (tax applied).", ReturnPlayerName( playerid ), playerid, g_AmmunationWeapons[ i ] [ E_NAME ], number_format( price ) );
 						SetPVarInt( playerid, "purchased_weapon", GetPVarInt( playerid, "purchased_weapon" ) + 1 );
-						SendClientMessageFormatted( playerid, -1, ""COL_ORANGE"[WEAPON DEAL]{FFFFFF} You have purchased a %s for "COL_GOLD"%s"COL_WHITE".", g_AmmunationWeapons[ i ] [ E_NAME ], ConvertPrice( price ) );
+						SendClientMessageFormatted( playerid, -1, ""COL_ORANGE"[WEAPON DEAL]{FFFFFF} You have purchased a %s for "COL_GOLD"%s"COL_WHITE".", g_AmmunationWeapons[ i ] [ E_NAME ], number_format( price ) );
 						GivePlayerWeapon( playerid, g_AmmunationWeapons[ i ] [ E_WEPID ], 15000 ); // Infinite
 						SetPlayerArmedWeapon( playerid, 0 );
 						GivePlayerCash( playerid, -( price ) );
@@ -24069,7 +24078,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 								GivePlayerCash( playerid, -iCostPrice );
 								GivePlayerWeapon( playerid, g_AmmunationWeapons[ i ] [ E_WEPID ], g_AmmunationWeapons[ i ] [ E_AMMO ] );
 								RedirectAmmunation( playerid, p_WeaponLockerMenu{ playerid }, "{FFFFFF}Weapon Locker - Purchase Weapons", DIALOG_WEAPON_LOCKER_BUY, 1.25 );
-								SendServerMessage( playerid, "You have purchased a %s(%d) for "COL_GOLD"%s"COL_WHITE"%s (inc. fees).", g_AmmunationWeapons[ i ] [ E_NAME ], g_AmmunationWeapons[ i ] [ E_AMMO ], ConvertPrice( iCostPrice ) );
+								SendServerMessage( playerid, "You have purchased a %s(%d) for "COL_GOLD"%s"COL_WHITE"%s (inc. fees).", g_AmmunationWeapons[ i ] [ E_NAME ], g_AmmunationWeapons[ i ] [ E_AMMO ], number_format( iCostPrice ) );
 								break;
 				            }
 				            x ++;
@@ -24116,7 +24125,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 
 						RedirectAmmunation( playerid, p_AmmunationMenu{ playerid } );
 						GivePlayerWeapon( playerid, g_AmmunationWeapons[ i ] [ E_WEPID ], g_AmmunationWeapons[ i ] [ E_AMMO ] );
-						SendServerMessage( playerid, "You have purchased a %s(%d) for "COL_GOLD"%s"COL_WHITE"%s.", g_AmmunationWeapons[ i ] [ E_NAME ], g_AmmunationWeapons[ i ] [ E_AMMO ], ConvertPrice( iCostPrice ), bDealer ? ( " (inc. discount)" ) : ( "" ) );
+						SendServerMessage( playerid, "You have purchased a %s(%d) for "COL_GOLD"%s"COL_WHITE"%s.", g_AmmunationWeapons[ i ] [ E_NAME ], g_AmmunationWeapons[ i ] [ E_AMMO ], number_format( iCostPrice ), bDealer ? ( " (inc. discount)" ) : ( "" ) );
 		                break;
 		            }
 		            x ++;
@@ -24477,7 +24486,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 					iNetProfit = floatround( g_houseFurniture[ i ] [ E_COST ] / 2 );
 
 				GivePlayerCash( playerid, iNetProfit );
-				SendClientMessageFormatted( playerid, -1, ""COL_GREY"[FURNITURE]"COL_WHITE" You have successfully sold your "COL_WHITE"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", g_houseFurniture[ i ] [ E_NAME ], ConvertPrice( iNetProfit ) );
+				SendClientMessageFormatted( playerid, -1, ""COL_GREY"[FURNITURE]"COL_WHITE" You have successfully sold your "COL_WHITE"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", g_houseFurniture[ i ] [ E_NAME ], number_format( iNetProfit ) );
         		ShowPlayerDialog( playerid, DIALOG_FURNITURE, DIALOG_STYLE_LIST, "{FFFFFF}Furniture", "Purchase Furniture\nSelect Furniture Easily\nSelect Furniture Manually\nSelect Furniture Nearest\n"COL_RED"Remove All Furniture", "Confirm", "Back" );
 			}
         }
@@ -25274,7 +25283,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 					if ( g_garageInteriorData[ intid ] [ E_PRICE ] > GetPlayerCash( playerid ) )
 					{
 						ShowPlayerDialog( playerid, DIALOG_GARAGE_INT_CONFIRM, DIALOG_STYLE_LIST, "{FFFFFF}Garage Interiors", "Purchase Garage Interior\nPreview Garage Interior", "Select", "Back" );
-						SendError( playerid, "This interior costs "COL_GOLD"%s"COL_WHITE". You don't have this amount.", ConvertPrice( g_garageInteriorData[ intid ] [ E_PRICE ] ) );
+						SendError( playerid, "This interior costs "COL_GOLD"%s"COL_WHITE". You don't have this amount.", number_format( g_garageInteriorData[ intid ] [ E_PRICE ] ) );
 					}
 					else if ( ArePlayersInGarage( playerid, p_InGarage[ playerid ] ) )
 					{
@@ -25292,7 +25301,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 					    GivePlayerCash( playerid, -( g_garageInteriorData[ intid ] [ E_PRICE ] ) );
 
 					    if ( intid != 0 )
-							SendServerMessage( playerid, "You have purchased a %s for "COL_GOLD"%s"COL_WHITE" your garage.", g_garageInteriorData[ intid ] [ E_NAME ], ConvertPrice( g_garageInteriorData[ intid ] [ E_PRICE ] ) );
+							SendServerMessage( playerid, "You have purchased a %s for "COL_GOLD"%s"COL_WHITE" your garage.", g_garageInteriorData[ intid ] [ E_NAME ], number_format( g_garageInteriorData[ intid ] [ E_PRICE ] ) );
 						else
 						    SendServerMessage( playerid, "You have successfully reset your interior to the default interior." );
 
@@ -25324,7 +25333,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 					InterpolateCameraPos( playerid, g_garageInteriorData[ intid ] [ E_PREVIEW_POS ] [ 0 ], g_garageInteriorData[ intid ] [ E_PREVIEW_POS ] [ 1 ], g_garageInteriorData[ intid ] [ E_PREVIEW_POS ] [ 2 ] + 1.5, g_garageInteriorData[ intid ] [ E_PREVIEW_LOOKAT ] [ 0 ], g_garageInteriorData[ intid ] [ E_PREVIEW_LOOKAT ] [ 1 ], g_garageInteriorData[ intid ] [ E_PREVIEW_LOOKAT ] [ 2 ], 15000, CAMERA_MOVE );
 					InterpolateCameraLookAt( playerid, g_garageInteriorData[ intid ] [ E_PREVIEW_LOOKAT ] [ 0 ], g_garageInteriorData[ intid ] [ E_PREVIEW_LOOKAT ] [ 1 ], g_garageInteriorData[ intid ] [ E_PREVIEW_LOOKAT ] [ 2 ], g_garageInteriorData[ intid ] [ E_PREVIEW_POS ] [ 0 ], g_garageInteriorData[ intid ] [ E_PREVIEW_POS ] [ 1 ], g_garageInteriorData[ intid ] [ E_PREVIEW_POS ] [ 2 ] + 1.5, 15000, CAMERA_MOVE );
 
-					SendServerMessage( playerid, "You are now previewing "COL_GREY"%s "COL_GOLD"%s"COL_WHITE". Press your enter key to stop.", g_garageInteriorData[ intid ] [ E_NAME ], ConvertPrice( g_garageInteriorData[ intid ] [ E_PRICE ] ) );
+					SendServerMessage( playerid, "You are now previewing "COL_GREY"%s "COL_GOLD"%s"COL_WHITE". Press your enter key to stop.", g_garageInteriorData[ intid ] [ E_NAME ], number_format( g_garageInteriorData[ intid ] [ E_PRICE ] ) );
 					SetPVarInt( playerid, "viewing_garageints", 1 );
 				}
 			}
@@ -25362,7 +25371,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				    	return SendError( playerid, "You need to be in a vehicle to use this command." );
 
 					if ( GetPlayerCash( playerid ) < g_vehicleComponentsData[ i ] [ E_PRICE ] )
-						return SendError( playerid, "You need %s to purchase this vehicle component.", ConvertPrice( g_vehicleComponentsData[ i ] [ E_PRICE ] ) );
+						return SendError( playerid, "You need %s to purchase this vehicle component.", number_format( g_vehicleComponentsData[ i ] [ E_PRICE ] ) );
 
 				    if ( GetPlayerState( playerid ) != PLAYER_STATE_DRIVER )
 				    	return SendError( playerid, "You need to be a driver to use this command." );
@@ -25424,7 +25433,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 
 					g_vehiclePimpData[ ownerid ] [ vehicleid ] [ E_OBJECT ] [ slotid ] = CreateDynamicObject( g_vehicleComponentsData[ i ] [ E_MODEL_ID ], 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, .worldid = GetVehicleVirtualWorld( g_vehicleData[ ownerid ] [ vehicleid ] [ E_VEHICLE_ID ]) );
 					AttachDynamicObjectToVehicle( g_vehiclePimpData[ ownerid ] [ vehicleid ] [ E_OBJECT ] [ slotid ], g_vehicleData[ ownerid ] [ vehicleid ] [ E_VEHICLE_ID ], 0.0, 0.0, 1.0, 0.0, 0.0, 0.0 );
-					return SendServerMessage( playerid, "You have bought a "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", g_vehicleComponentsData[ i ] [ E_NAME ], ConvertPrice( g_vehicleComponentsData[ i ] [ E_PRICE ] ) );
+					return SendServerMessage( playerid, "You have bought a "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", g_vehicleComponentsData[ i ] [ E_NAME ], number_format( g_vehicleComponentsData[ i ] [ E_PRICE ] ) );
 				}
 			}
 		}
@@ -25548,7 +25557,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				g_vehiclePimpData[ ownerid ] [ vehicleid ] [ E_CREATED ] [ i ] = false;
 
 				mysql_single_query( sprintf( "DELETE FROM `COMPONENTS` WHERE `ID`=%d", g_vehiclePimpData[ ownerid ] [ vehicleid ] [ E_SQL_ID ] [ i ] ) );
-				SendServerMessage( playerid, "You have sold your "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", g_vehicleComponentsData[ pimpid ] [ E_NAME ], ConvertPrice( sellPrice ) );
+				SendServerMessage( playerid, "You have sold your "COL_GREY"%s"COL_WHITE" for "COL_GOLD"%s"COL_WHITE".", g_vehicleComponentsData[ pimpid ] [ E_NAME ], number_format( sellPrice ) );
 			}
 		}
 	}
@@ -25761,7 +25770,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 		}
 
 		g_raceData[ raceid ] [ E_ENTRY_FEE ] = fee;
-		SendClientMessageToRace( raceid, COLOR_GREY, "[RACE]"COL_WHITE" The entry fee for the race has been set to %s.", ConvertPrice( fee ) );
+		SendClientMessageToRace( raceid, COLOR_GREY, "[RACE]"COL_WHITE" The entry fee for the race has been set to %s.", number_format( fee ) );
 		return ShowRaceConfiguration( playerid, raceid );
 	}
 	if ( dialogid == DIALOG_RACE_POS )
@@ -25812,7 +25821,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 			case 0: ShowPlayerDialog( playerid, DIALOG_BUSINESS_NAME, DIALOG_STYLE_INPUT, ""COL_GREY"Business System", sprintf( ""COL_WHITE"The current business name is %s\n\n"COL_WHITE"Enter below the new name for it", g_businessData[ businessid ] [ E_NAME ] ), "Update", "Back" );
 
 			// bank account
-			case 1: ShowPlayerDialog( playerid, DIALOG_BUSINESS_WITHDRAW, DIALOG_STYLE_INPUT, ""COL_GREY"Business System", sprintf( ""COL_WHITE"Enter the amount that you are willing to withdraw from your business bank account.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( g_businessData[ businessid ] [ E_BANK ] ) ), "Withdraw", "Back" );
+			case 1: ShowPlayerDialog( playerid, DIALOG_BUSINESS_WITHDRAW, DIALOG_STYLE_INPUT, ""COL_GREY"Business System", sprintf( ""COL_WHITE"Enter the amount that you are willing to withdraw from your business bank account.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( g_businessData[ businessid ] [ E_BANK ] ) ), "Withdraw", "Back" );
 
 			// add members
 			case 2: ShowBusinessMembers( playerid, businessid );
@@ -25826,13 +25835,13 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				format( szBigString, sizeof( szBigString ),
 					""COL_WHITE"Your business has %d product\t \nSell Product Locally\t%s%s\nSell Product Nationally\t%s%s",
 					g_businessData[ businessid ] [ E_PRODUCT ], prod > g_businessInteriorData[ business_type ] [ E_COST_PRICE ] ? ( COL_GREEN ) : ( COL_RED ),
-					ConvertPrice( prod ), prod_hardened > g_businessInteriorData[ business_type ] [ E_COST_PRICE ] ? ( COL_GREEN ) : ( COL_RED ), ConvertPrice( prod_hardened )
+					number_format( prod ), prod_hardened > g_businessInteriorData[ business_type ] [ E_COST_PRICE ] ? ( COL_GREEN ) : ( COL_RED ), number_format( prod_hardened )
 				);
 				ShowPlayerDialog( playerid, DIALOG_BUSINESS_SELL, DIALOG_STYLE_TABLIST_HEADERS, ""COL_GREY"Business System", szBigString, "Select", "Back" );
 			}
 
 			// buy stock
-			case 4: ShowPlayerDialog( playerid, DIALOG_BUSINESS_BUY, DIALOG_STYLE_TABLIST_HEADERS, ""COL_GREY"Business System", sprintf( ""COL_WHITE"Your business has %d supplies\t \nBuy Supply\t%s\nSteal Supplies\t"COL_YELLOW"FREE", g_businessData[ businessid ] [ E_SUPPLIES ], ConvertPrice( GetResupplyPrice( business_type ) ) ), "Select", "Back" );
+			case 4: ShowPlayerDialog( playerid, DIALOG_BUSINESS_BUY, DIALOG_STYLE_TABLIST_HEADERS, ""COL_GREY"Business System", sprintf( ""COL_WHITE"Your business has %d supplies\t \nBuy Supply\t%s\nSteal Supplies\t"COL_YELLOW"FREE", g_businessData[ businessid ] [ E_SUPPLIES ], number_format( GetResupplyPrice( business_type ) ) ), "Select", "Back" );
 
 			// upgrade
 			case 5: ShowBusinessUpgrades( playerid, businessid );
@@ -25863,7 +25872,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				for ( new i = 0; i < sizeof( g_businessCarModelData ); i ++ )
 				{
 					new vehicle_model_index = g_businessCarModelData[ i ] [ E_ID ], bool: is_unlocked = ( 0 <= vehicle_model_index < MAX_BIZ_VEH_MODELS ) ? ( g_businessVehicleUnlocked[ businessid ] { vehicle_model_index } ) : false;
-					format( szLargeString, sizeof( szLargeString ), "%s%s%s\t"COL_GOLD"%s\n", szLargeString, is_unlocked ? ( COL_LGREEN ) : ( "" ), g_businessCarModelData[ i ] [ E_NAME ], ConvertPrice( g_businessCarModelData[ i ] [ E_COST ] ) );
+					format( szLargeString, sizeof( szLargeString ), "%s%s%s\t"COL_GOLD"%s\n", szLargeString, is_unlocked ? ( COL_LGREEN ) : ( "" ), g_businessCarModelData[ i ] [ E_NAME ], number_format( g_businessCarModelData[ i ] [ E_COST ] ) );
 				}
 
 				return ShowPlayerDialog( playerid, DIALOG_BUSINESS_CAR, DIALOG_STYLE_TABLIST_HEADERS, ""COL_GREY"Business System", szLargeString, "Purchase", "Back" );
@@ -25876,7 +25885,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 
 				for ( new i = 0; i < sizeof( g_businessAirModelData ); i ++ ) {
 					new vehicle_model_index = g_businessAirModelData[ i ] [ E_ID ], bool: is_unlocked = ( 0 <= vehicle_model_index < MAX_BIZ_VEH_MODELS ) ? ( g_businessVehicleUnlocked[ businessid ] { vehicle_model_index } ) : false;
-					format( szLargeString, sizeof( szLargeString ), "%s%s%s\t"COL_GOLD"%s\n", szLargeString, is_unlocked ? ( COL_LGREEN ) : ( "" ), g_businessAirModelData[ i ] [ E_NAME ], ConvertPrice( g_businessAirModelData[ i ] [ E_COST ] ) );
+					format( szLargeString, sizeof( szLargeString ), "%s%s%s\t"COL_GOLD"%s\n", szLargeString, is_unlocked ? ( COL_LGREEN ) : ( "" ), g_businessAirModelData[ i ] [ E_NAME ], number_format( g_businessAirModelData[ i ] [ E_COST ] ) );
 				}
 
 				return ShowPlayerDialog( playerid, DIALOG_BUSINESS_HELI, DIALOG_STYLE_TABLIST_HEADERS, ""COL_GREY"Business System", szLargeString, "Purchase", "Back" );
@@ -25889,13 +25898,13 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 					return ShowBusinessUpgrades( playerid, businessid ), SendError( playerid, "Your business production has been already upgraded." );
 
 				if ( GetPlayerCash( playerid ) < g_businessInteriorData[ business_type ] [ E_UPGRADE_COST ] )
-					return ShowBusinessUpgrades( playerid, businessid ), SendError( playerid, "You don't have enough money to upgrade this business (%s).", ConvertPrice( g_businessInteriorData[ business_type ] [ E_UPGRADE_COST ] ) );
+					return ShowBusinessUpgrades( playerid, businessid ), SendError( playerid, "You don't have enough money to upgrade this business (%s).", number_format( g_businessInteriorData[ business_type ] [ E_UPGRADE_COST ] ) );
 
 				CreateBusinessActors( businessid );
 				g_businessData[ businessid ] [ E_UPGRADES ] = 1;
 				GivePlayerCash( playerid, - g_businessInteriorData[ business_type ] [ E_UPGRADE_COST ] );
 				mysql_single_query( sprintf( "UPDATE `BUSINESSES` SET `UPGRADES`=1 WHERE `ID`=%d", businessid ) );
-				return ShowBusinessUpgrades( playerid, businessid ), SendServerMessage( playerid, "You have upgraded business production for "COL_GOLD"%s"COL_WHITE".", ConvertPrice( g_businessInteriorData[ business_type ] [ E_UPGRADE_COST ] ) );
+				return ShowBusinessUpgrades( playerid, businessid ), SendServerMessage( playerid, "You have upgraded business production for "COL_GOLD"%s"COL_WHITE".", number_format( g_businessInteriorData[ business_type ] [ E_UPGRADE_COST ] ) );
 			}
 
 			// upgrade slots
@@ -26040,9 +26049,9 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
             GivePlayerCash( playerid, iWithdraw );
             UpdateBusinessData( businessid );
             UpdateBusinessProductionLabel( businessid );
-            SendServerMessage( playerid, "You have withdrawn %s from your business account.", ConvertPrice( iWithdraw ) );
+            SendServerMessage( playerid, "You have withdrawn %s from your business account.", number_format( iWithdraw ) );
         }
-		return ShowPlayerDialog( playerid, DIALOG_BUSINESS_WITHDRAW, DIALOG_STYLE_INPUT, ""COL_GREY"Business System", sprintf( ""COL_WHITE"Enter the amount that you are willing to withdraw from your business bank account.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", ConvertPrice( g_businessData[ businessid ] [ E_BANK ] ) ), "Withdraw", "Back" );
+		return ShowPlayerDialog( playerid, DIALOG_BUSINESS_WITHDRAW, DIALOG_STYLE_INPUT, ""COL_GREY"Business System", sprintf( ""COL_WHITE"Enter the amount that you are willing to withdraw from your business bank account.\n\n"COL_GREY"Current Balance:"COL_WHITE" %s", number_format( g_businessData[ businessid ] [ E_BANK ] ) ), "Withdraw", "Back" );
 	}
 	if ( dialogid == DIALOG_BUSINESS_MEMBERS )
 	{
@@ -26251,7 +26260,7 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				g_businessData[ businessid ] [ E_SUPPLIES ] ++;
 
 				// alert and redirect
-				SendServerMessage( playerid, "You have bought business supplies for "COL_GOLD"%s"COL_WHITE". "COL_ORANGE"(%d/%d)", ConvertPrice( price ), g_businessData[ businessid ] [ E_SUPPLIES ],  g_businessInteriorData[ business_type ] [ E_MAX_SUPPLIES ] );
+				SendServerMessage( playerid, "You have bought business supplies for "COL_GOLD"%s"COL_WHITE". "COL_ORANGE"(%d/%d)", number_format( price ), g_businessData[ businessid ] [ E_SUPPLIES ],  g_businessInteriorData[ business_type ] [ E_MAX_SUPPLIES ] );
 
 				// start prod if viable
 				StartBusinessDrugProduction( businessid );
@@ -26262,7 +26271,42 @@ public OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				SendError( playerid, "This feature is currently under construction." );
 			}
 		}
-		return ShowPlayerDialog( playerid, DIALOG_BUSINESS_BUY, DIALOG_STYLE_TABLIST_HEADERS, ""COL_GREY"Business System", sprintf( ""COL_WHITE"Your business has %d supplies\t \nBuy Supply\t%s\nSteal Supplies\t"COL_YELLOW"FREE", g_businessData[ businessid ] [ E_SUPPLIES ], ConvertPrice( GetResupplyPrice( business_type ) ) ), "Select", "Back" ), 1;
+		return ShowPlayerDialog( playerid, DIALOG_BUSINESS_BUY, DIALOG_STYLE_TABLIST_HEADERS, ""COL_GREY"Business System", sprintf( ""COL_WHITE"Your business has %d supplies\t \nBuy Supply\t%s\nSteal Supplies\t"COL_YELLOW"FREE", g_businessData[ businessid ] [ E_SUPPLIES ], number_format( GetResupplyPrice( business_type ) ) ), "Select", "Back" ), 1;
+	}
+	if ( dialogid == DIALOG_AIRPORT && response )
+	{
+		if ( IsPlayerJailed( playerid ) ) return SendError( playerid, "You cannot travel while you're in jail." );
+		if ( p_WantedLevel[ playerid ] ) return SendError( playerid, "You cannot travel while you are wanted." );
+
+		new bool: using_rewards = false;
+
+		// check for rewards
+		if ( p_CasinoRewardsPoints[ playerid ] > 5.0 ) {
+			using_rewards = true, p_CasinoRewardsPoints[ playerid ] -= 5.0;
+			mysql_single_query( sprintf( "UPDATE `USERS` SET `CASINO_REWARDS`=%f WHERE `ID`=%d", p_CasinoRewardsPoints[ playerid ], p_AccountID[ playerid ] ) );
+		}
+		else if ( GetPlayerCash( playerid ) > 2000 ) GivePlayerCash( playerid, -2000 );
+		else return SendError( playerid, "You need $2,000 to travel between cities." );
+
+		// set position
+		switch ( listitem )
+		{
+			case 0: {
+				if ( IsPlayerInDynamicCP( playerid, g_Checkpoints[ CP_AIRPORT_SF ] ) ) return SendError( playerid, "You're already in San Fierro." );
+				SendServerMessage( playerid, "It has cost you "COL_GOLD"%s"COL_WHITE" to travel. Welcome to San Fierro!", using_rewards ? ( "5 casino reward points" ) : ( "$2,000" ) );
+				SetPlayerPos( playerid, -1422.4063, -286.5081, 14.1484 );
+			}
+			case 1: {
+				if ( IsPlayerInDynamicCP( playerid, g_Checkpoints[ CP_AIRPORT_LV ] ) ) return SendError( playerid, "You're already in Las Venturas." );
+				SendServerMessage( playerid, "It has cost you "COL_GOLD"%s"COL_WHITE" to travel. Welcome to Las Venturas!", using_rewards ? ( "5 casino reward points" ) : ( "$2,000" ) );
+				SetPlayerPos( playerid, 1672.5364, 1447.8616, 10.7881 );
+			}
+			case 2: {
+				if ( IsPlayerInDynamicCP( playerid, g_Checkpoints[ CP_AIRPORT_LS ] ) ) return SendError( playerid, "You're already in Los Santos." );
+				SendServerMessage( playerid, "It has cost you "COL_GOLD"%s"COL_WHITE" to travel. Welcome to Los Santos!", using_rewards ? ( "5 casino reward points" ) : ( "$2,000" ) );
+				SetPlayerPos( playerid, 1642.2274, -2335.4978, 13.5469 );
+			}
+		}
 	}
 	return 1;
 }
@@ -27525,6 +27569,9 @@ stock initializeCheckpoints( )
 	g_Checkpoints[ CP_REWARDS_CALIG ] = CreateDynamicCP( 2157.6294, 1599.4355, 1006.1797, 1.0, -1, -1, -1, 30.0 );
 	g_Checkpoints[ CP_REWARDS_4DRAG ] = CreateDynamicCP( 1951.7191, 997.5555, 992.8594, 1.0, -1, -1, -1, 30.0 );
 	g_Checkpoints[ CP_REWARDS_VISAGE ] = CreateDynamicCP( 2604.1323, 1570.1182, 1508.3530, 1.0, -1, -1, -1, 30.0 );
+	g_Checkpoints[ CP_AIRPORT_LV ] = CreateDynamicCP( 1672.53640, 1447.86160, 10.7881, 1.0, -1, -1, -1, 30.0 );
+	g_Checkpoints[ CP_AIRPORT_LS ] = CreateDynamicCP( 1642.22740, -2335.4978, 13.5469, 1.0, -1, -1, -1, 30.0 );
+	g_Checkpoints[ CP_AIRPORT_SF ] = CreateDynamicCP( -1422.4063, -286.50810, 14.1484, 1.0, -1, -1, -1, 30.0 );
 
 	// Out of SF
 	CreateDynamic3DTextLabel("[DROP OFF]", COLOR_GOLD,  -211.6869, 979.3518, 19.3237, 50.0);
@@ -27572,6 +27619,9 @@ stock initializeCheckpoints( )
 	CreateDynamic3DTextLabel("[REFILL AMMO]", COLOR_GOLD, 1579.5439, -1635.5166, 13.5609, 20.0);
 	#endif
 
+	CreateDynamic3DTextLabel("[AIRPORT]", COLOR_GOLD,  1672.53640, 1447.86160, 10.7881, 50.0);
+	CreateDynamic3DTextLabel("[AIRPORT]", COLOR_GOLD,  1642.22740, -2335.4978, 13.5469, 50.0);
+	CreateDynamic3DTextLabel("[AIRPORT]", COLOR_GOLD,  -1422.4063, -286.50810, 14.1484, 50.0);
 	CreateDynamic3DTextLabel("[REFILL AMMO]", COLOR_GOLD, -1615.2600, 685.5120, 7.1875, 20.0);
 	CreateDynamic3DTextLabel("[PAWNSHOP]", COLOR_GOLD, 1333.0847, -1080.0726, 968.0430, 20.0);
 	CreateDynamic3DTextLabel("[SHOP]", COLOR_GOLD, -29.0409,-184.7446,1003.5469, 20.0);
@@ -27988,7 +28038,7 @@ thread OnHouseLoad( )
 			g_houseData[ hID ] [ E_MAP_ICON ] = strmatch( g_houseData[ hID ] [ E_OWNER ], "No-one" ) ? CreateDynamicMapIcon( g_houseData[ hID ] [ E_EX ], g_houseData[ hID ] [ E_EY ], g_houseData[ hID ] [ E_EZ ], 31, 0, -1, -1, -1, HOUSE_MAPICON_RADIUS ) : INVALID_OBJECT_ID;
 			g_houseData[ hID ] [ E_CHECKPOINT ] [ 0 ] = CreateDynamicCP( g_houseData[ hID ] [ E_EX ], g_houseData[ hID ] [ E_EY ], g_houseData[ hID ] [ E_EZ ], 1.0, -1, 0, -1, 100.0 );
 			g_houseData[ hID ] [ E_CHECKPOINT ] [ 1 ] = CreateDynamicCP( g_houseData[ hID ] [ E_TX ], g_houseData[ hID ] [ E_TY ], g_houseData[ hID ] [ E_TZ ], 1.0, g_houseData[ hID ] [ E_WORLD ], g_houseData[ hID ] [ E_INTERIOR_ID ], -1, 100.0 );
-	        format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", g_houseData[ hID ] [ E_HOUSE_NAME ], hID, g_houseData[ hID ] [ E_OWNER ], ConvertPrice( g_houseData[ hID ] [ E_COST ] ) );
+	        format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", g_houseData[ hID ] [ E_HOUSE_NAME ], hID, g_houseData[ hID ] [ E_OWNER ], number_format( g_houseData[ hID ] [ E_COST ] ) );
 	        g_houseData[ hID ] [ E_LABEL ] [ 0 ] = CreateDynamic3DTextLabel( szBigString, COLOR_WHITE, g_houseData[ hID ] [ E_EX ], g_houseData[ hID ] [ E_EY ], g_houseData[ hID ] [ E_EZ ], 20.0 );
 			g_houseData[ hID ] [ E_LABEL ] [ 1 ] = CreateDynamic3DTextLabel( "[EXIT]", COLOR_GOLD, g_houseData[ hID ] [ E_TX ], g_houseData[ hID ] [ E_TY ], g_houseData[ hID ] [ E_TZ ], 20.0, INVALID_PLAYER_ID, INVALID_VEHICLE_ID, 0, g_houseData[ hID ] [ E_WORLD ] );
 			g_houseData[ hID ] [ E_CREATED ] = true;
@@ -28041,7 +28091,7 @@ stock CreateHouse( cost, Float: eX, Float: eY, Float: eZ, Float: tX = H_DEFAULT_
 	for( new i; i < MAX_HOUSE_WEAPONS; i++ )
 	    g_HouseWeapons[ hID ] [ i ] = 0, g_HouseWeaponAmmo[ hID ] [ i ] = -1;
 
-	format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", g_houseData[ hID ] [ E_HOUSE_NAME ], hID, g_houseData[ hID ] [ E_OWNER ], ConvertPrice( cost ) );
+	format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", g_houseData[ hID ] [ E_HOUSE_NAME ], hID, g_houseData[ hID ] [ E_OWNER ], number_format( cost ) );
     g_houseData[ hID ] [ E_LABEL ] [ 0 ] = CreateDynamic3DTextLabel( szBigString, COLOR_WHITE, eX, eY, eZ, 20.0 );
 	g_houseData[ hID ] [ E_LABEL ] [ 1 ] = CreateDynamic3DTextLabel( "[EXIT]", COLOR_GOLD, tX, tY, tZ, 20.0, INVALID_PLAYER_ID, INVALID_VEHICLE_ID, 0, g_houseData[ hID ] [ E_WORLD ] );
 
@@ -28118,7 +28168,7 @@ stock SetHouseForAuction( ID )
 	destroyAllFurniture( ID );
 	format( query, sizeof( query ), "UPDATE HOUSES SET OWNER='No-one',PASSWORD='N/A',NAME='Home',TX=%f,TY=%f,TZ=%f,INTERIOR=%d WHERE ID=%d", g_houseData[ ID ] [ E_TX ], g_houseData[ ID ] [ E_TY ], g_houseData[ ID ] [ E_TZ ], g_houseData[ ID ] [ E_INTERIOR_ID ], ID );
     mysql_single_query( query );
-	format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" Home(%d)\n"COL_GOLD"Owner:"COL_WHITE" No-one\n"COL_GOLD"Price:"COL_WHITE" %s", ID, ConvertPrice( g_houseData[ ID ] [ E_COST ] ) );
+	format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" Home(%d)\n"COL_GOLD"Owner:"COL_WHITE" No-one\n"COL_GOLD"Price:"COL_WHITE" %s", ID, number_format( g_houseData[ ID ] [ E_COST ] ) );
 	UpdateDynamic3DTextLabelText( g_houseData[ ID ] [ E_LABEL ] [ 0 ], COLOR_WHITE, szBigString);
 	DestroyDynamic3DTextLabel( g_houseData[ ID ] [ E_LABEL ] [ 1 ] );
 	g_houseData[ ID ] [ E_LABEL ] [ 1 ] = CreateDynamic3DTextLabel( "[EXIT]", COLOR_GOLD, g_houseData[ ID ] [ E_TX ], g_houseData[ ID ] [ E_TY ], g_houseData[ ID ] [ E_TZ ], 20.0, INVALID_PLAYER_ID, INVALID_VEHICLE_ID, 0, g_houseData[ ID ] [ E_WORLD ] );
@@ -28143,7 +28193,7 @@ stock SetHouseOwner( houseid, szOwner[ MAX_PLAYER_NAME ] )
 	mysql_single_query( query );
 
 	DestroyDynamicMapIcon( g_houseData[ houseid ] [ E_MAP_ICON ] );
-	format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" Home(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", houseid, g_houseData[ houseid ] [ E_OWNER ], ConvertPrice( g_houseData[ houseid ] [ E_COST ] ) );
+	format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" Home(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", houseid, g_houseData[ houseid ] [ E_OWNER ], number_format( g_houseData[ houseid ] [ E_COST ] ) );
  	UpdateDynamic3DTextLabelText( g_houseData[ houseid ] [ E_LABEL ] [ 0 ], COLOR_WHITE, szBigString);
 	return 1;
 }
@@ -30708,9 +30758,9 @@ stock RedirectAmmunation( playerid, listitem, custom_title[ ] = "{FFFFFF}Ammu-Na
 	for( new i; i < sizeof( g_AmmunationWeapons ); i++ ) if ( g_AmmunationWeapons[ i ] [ E_MENU ] == listitem )
 	{
 	   	if ( ! unlimited_ammo ) // Other multipliers will not specify ammo
-	   		format( szString, sizeof( szString ), "%s%s\t%d\t"COL_GOLD"%s\n", szString, g_AmmunationWeapons[ i ] [ E_NAME ], g_AmmunationWeapons[ i ] [ E_AMMO ], ConvertPrice( floatround( g_AmmunationWeapons[ i ] [ E_PRICE ] * custom_multplier ) ) );
+	   		format( szString, sizeof( szString ), "%s%s\t%d\t"COL_GOLD"%s\n", szString, g_AmmunationWeapons[ i ] [ E_NAME ], g_AmmunationWeapons[ i ] [ E_AMMO ], number_format( floatround( g_AmmunationWeapons[ i ] [ E_PRICE ] * custom_multplier ) ) );
 		else
-			format( szString, sizeof( szString ), "%s%s\t"COL_GOLD"%s\n", szString, g_AmmunationWeapons[ i ] [ E_NAME ], ConvertPrice( floatround( g_AmmunationWeapons[ i ] [ E_PRICE ] * custom_multplier ) ) );
+			format( szString, sizeof( szString ), "%s%s\t"COL_GOLD"%s\n", szString, g_AmmunationWeapons[ i ] [ E_NAME ], number_format( floatround( g_AmmunationWeapons[ i ] [ E_PRICE ] * custom_multplier ) ) );
 	}
     ShowPlayerDialog( playerid, custom_dialogid, DIALOG_STYLE_TABLIST_HEADERS, custom_title, szString, "Purchase", "Back" );
     return 1;
@@ -30999,7 +31049,7 @@ stock ShowFurnitureList( playerid, category )
 	szLargeString = ""COL_WHITE"Furniture\t"COL_WHITE"Cost\n";
 
     for( new i = 0; i < sizeof( g_houseFurniture ); i++ ) if ( g_houseFurniture[ i ] [ E_CATEGORY ] == category )
-		format( szLargeString, sizeof( szLargeString ), "%s%s\t"COL_GOLD"%s\n", szLargeString, g_houseFurniture[ i ] [ E_NAME ], ConvertPrice( g_houseFurniture[ i ] [ E_COST ] ) );
+		format( szLargeString, sizeof( szLargeString ), "%s%s\t"COL_GOLD"%s\n", szLargeString, g_houseFurniture[ i ] [ E_NAME ], number_format( g_houseFurniture[ i ] [ E_COST ] ) );
 
 	ShowPlayerDialog( playerid, DIALOG_FURNITURE_LIST, DIALOG_STYLE_TABLIST_HEADERS, "Furniture", szLargeString, "Select", "Back" );
 }
@@ -31258,7 +31308,7 @@ stock ShowBuyableVehiclesTypeDialog( playerid, type_id )
 	for( new i; i < sizeof( g_BuyableVehicleData ); i++ )
 	{
 		if ( g_BuyableVehicleData[ i ] [ E_TYPE ] == type_id )
-			format( szBuyableVehicles, sizeof( szBuyableVehicles ), "%s"COL_GOLD"%s%s%s\t%s\n", szBuyableVehicles, ConvertPrice( g_BuyableVehicleData[ i ] [ E_PRICE ] ), g_BuyableVehicleData[ i ] [ E_VIP ] ? ( "" ) : ( #COL_WHITE ), g_BuyableVehicleData[ i ] [ E_PRICE ] < 100000 ? ( "\t" ) : ( "" ), g_BuyableVehicleData[ i ] [ E_NAME ] );
+			format( szBuyableVehicles, sizeof( szBuyableVehicles ), "%s"COL_GOLD"%s%s%s\t%s\n", szBuyableVehicles, number_format( g_BuyableVehicleData[ i ] [ E_PRICE ] ), g_BuyableVehicleData[ i ] [ E_VIP ] ? ( "" ) : ( #COL_WHITE ), g_BuyableVehicleData[ i ] [ E_PRICE ] < 100000 ? ( "\t" ) : ( "" ), g_BuyableVehicleData[ i ] [ E_NAME ] );
 	}
 
 	ShowPlayerDialog( playerid, DIALOG_VEHDEALER_BUY, DIALOG_STYLE_LIST, "{FFFFFF}Vehicle Dealership", szBuyableVehicles, "Options", "Cancel" );
@@ -32296,7 +32346,7 @@ stock ShowPlayerShopMenu( playerid )
 	{
 		strcat( szString, ""COL_GREY"\t\tThe grey coloured options are non-savable.\n" );
 		for( new i; i < sizeof( g_shopItemData ); i++ )
-	 		format( szString, sizeof( szString ), "%s"COL_GOLD"%s%s\t\t%s "COL_ORANGE"(%s)\n", szString, ConvertPrice( g_shopItemData[ i ] [ E_PRICE ] ), g_shopItemData[ i ] [ E_SAVABLE ] ? ( COL_WHITE ) : ( COL_GREY ), g_shopItemData[ i ] [ E_NAME ], g_shopItemData[ i ] [ E_USAGE ] );
+	 		format( szString, sizeof( szString ), "%s"COL_GOLD"%s%s\t\t%s "COL_ORANGE"(%s)\n", szString, number_format( g_shopItemData[ i ] [ E_PRICE ] ), g_shopItemData[ i ] [ E_SAVABLE ] ? ( COL_WHITE ) : ( COL_GREY ), g_shopItemData[ i ] [ E_NAME ], g_shopItemData[ i ] [ E_USAGE ] );
 	}
 	return ShowPlayerDialog( playerid, DIALOG_SHOP_MENU, DIALOG_STYLE_LIST, "{FFFFFF}Shop Items", szString, "Select", "Cancel" );
 }
@@ -32795,7 +32845,7 @@ thread readmoneylog( playerid, searchid )
 			cache_get_field_content( i, "DATE", szTime );
 			iCashMoney = cache_get_field_content_int( i, "CASH", dbHandle );
 
-			format( szLargeString, sizeof( szLargeString ), "%s%s\t%s\t%s\n", szLargeString, szName, ConvertPrice( iCashMoney ), szTime );
+			format( szLargeString, sizeof( szLargeString ), "%s%s\t%s\t%s\n", szLargeString, szName, number_format( iCashMoney ), szTime );
 		}
 
 		ShowPlayerDialog( playerid, DIALOG_NULL, DIALOG_STYLE_TABLIST_HEADERS, sprintf( "{FFFFFF}Transactions sent by %s(%d)", ReturnPlayerName( searchid ), searchid ), szLargeString, "Okay", "" );
@@ -33067,7 +33117,7 @@ stock showToyCategoryItems( playerid, category, bool: pawnshop = false )
 		if ( g_ToyData[ i ] [ E_CATEGORY ] == category )
 		{
 			if ( pawnshop ) {
-				format( szLargeString, sizeof( szLargeString ), "%s%s%s\t"COL_GOLD"%s\n", szLargeString, p_ToyUnlocked[ playerid ] { g_ToyData[ i ] [ E_ID ] } ? ( #COL_LGREEN ) : ( #COL_WHITE ), g_ToyData[ i ] [ E_NAME ], ConvertPrice( g_ToyData[ i ] [ E_PRICE ] ) );
+				format( szLargeString, sizeof( szLargeString ), "%s%s%s\t"COL_GOLD"%s\n", szLargeString, p_ToyUnlocked[ playerid ] { g_ToyData[ i ] [ E_ID ] } ? ( #COL_LGREEN ) : ( #COL_WHITE ), g_ToyData[ i ] [ E_NAME ], number_format( g_ToyData[ i ] [ E_PRICE ] ) );
 			} else {
 				format( szLargeString, sizeof( szLargeString ), "%s%s%s\n", szLargeString, g_ToyData[ i ] [ E_ID ] != -1 ? ( !p_ToyUnlocked[ playerid ] { g_ToyData[ i ] [ E_ID ] } ? ( "{3D3D3D}" ) : ( "{FFFFFF}" ) ) : ( COL_GOLD ), g_ToyData[ i ] [ E_NAME ] );
 			}
@@ -33312,7 +33362,7 @@ stock CreateGarage( iAccountID, iPrice, iInterior, Float: fX, Float: fY, Float:
 		g_garageData[ iGarage ] [ E_ANGLE ] = fAngle;
 
 		g_garageData[ iGarage ] [ E_CHECKPOINT ] = CreateDynamicCP( fX, fY, fZ, 3.0, -1, 0, -1, 100.0 );
-	    g_garageData[ iGarage ] [ E_LABEL ] 	 = CreateDynamic3DTextLabel( sprintf( "Garage(%d)\nOwner:"COL_WHITE" No-one\n"COL_GOLD"Price:"COL_WHITE" %s", iGarage, ConvertPrice( g_garageData[ iGarage ] [ E_PRICE ] ) ), COLOR_GOLD, fX, fY, fZ, 20.0 );
+	    g_garageData[ iGarage ] [ E_LABEL ] 	 = CreateDynamic3DTextLabel( sprintf( "Garage(%d)\nOwner:"COL_WHITE" No-one\n"COL_GOLD"Price:"COL_WHITE" %s", iGarage, number_format( g_garageData[ iGarage ] [ E_PRICE ] ) ), COLOR_GOLD, fX, fY, fZ, 20.0 );
 
 		if ( iExistingID != ITER_NONE && iAccountID ) UpdateGarageTitle( iGarage );
 		else if ( iExistingID == ITER_NONE )
@@ -33367,7 +33417,7 @@ thread OnUpdateGarageTitle( slot )
 	if ( rows )
 		cache_get_field_content( 0, "NAME", szOwner );
 
-	UpdateDynamic3DTextLabelText( g_garageData[ slot ] [ E_LABEL ], COLOR_GOLD, sprintf( "Garage(%d)\nOwner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", slot, szOwner, ConvertPrice( g_garageData[ slot ] [ E_PRICE ] ) ) );
+	UpdateDynamic3DTextLabelText( g_garageData[ slot ] [ E_LABEL ], COLOR_GOLD, sprintf( "Garage(%d)\nOwner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", slot, szOwner, number_format( g_garageData[ slot ] [ E_PRICE ] ) ) );
 	return 1;
 }
 
@@ -33788,11 +33838,11 @@ stock SplitPlayerCashForGang( playerid, Float: cashRobbed )
 		new
 			iRoundedBanked = floatround( cashBanked, floatround_floor );
 
-		SendServerMessage( playerid, "You've split %s (%d%s) towards your gang's bank balance.", ConvertPrice( iRoundedBanked ), p_GangSplitProfits[ playerid ], "%%" );
+		SendServerMessage( playerid, "You've split %s (%d%s) towards your gang's bank balance.", number_format( iRoundedBanked ), p_GangSplitProfits[ playerid ], "%%" );
 
 		if ( -1 < iRoundedBanked > 50000 )
 		{
-			printf( "[EXPLOIT] [0xC1] %s has tried to store %s to gang %d", ReturnPlayerName( playerid ), ConvertPrice( iRoundedBanked ), p_GangID[ playerid ] );
+			printf( "[EXPLOIT] [0xC1] %s has tried to store %s to gang %d", ReturnPlayerName( playerid ), number_format( iRoundedBanked ), p_GangID[ playerid ] );
 			return SendError( playerid, "An exploit (0xC2) had occured, therefore this robbery was denied. Please report this to Lorenc!" );
 		}
 
@@ -33806,7 +33856,7 @@ stock SplitPlayerCashForGang( playerid, Float: cashRobbed )
 	{
 		if ( -1 < iRoundedRobbed > 50000 )
 		{
-			printf( "[EXPLOIT] [0xC1] %s has robbed %s", ReturnPlayerName( playerid ), ConvertPrice( iRoundedRobbed ) );
+			printf( "[EXPLOIT] [0xC1] %s has robbed %s", ReturnPlayerName( playerid ), number_format( iRoundedRobbed ) );
 			return SendError( playerid, "An exploit (0xC1) had occured, therefore this robbery was denied. Please report this to Lorenc!" );
 		}
 
@@ -34115,10 +34165,10 @@ stock UpdateCasinoPoolLabels( poolid )
 	for( new i = 0; i < POOL_ENTITIES; i ++ )
 	{
 		if ( IsValidDynamicObject( g_casinoPoolData[ poolid ] [ E_OBJECT ] [ i ] ) )
-			SetDynamicObjectMaterialText( g_casinoPoolData[ poolid ] [ E_OBJECT ] [ i ], 0, sprintf( "%s PRIZE", ConvertPrice( g_casinoPoolData[ poolid ] [ E_POOL ] ) ), 130, "Arial", 20, 1, 0xFF00FF00, 0, 1 );
+			SetDynamicObjectMaterialText( g_casinoPoolData[ poolid ] [ E_OBJECT ] [ i ], 0, sprintf( "%s PRIZE", number_format( g_casinoPoolData[ poolid ] [ E_POOL ] ) ), 130, "Arial", 20, 1, 0xFF00FF00, 0, 1 );
 
 		if ( IsValidDynamic3DTextLabel( g_casinoPoolData[ poolid ] [ E_LABEL ] [ i ] ) )
-			UpdateDynamic3DTextLabelText( g_casinoPoolData[ poolid ] [ E_LABEL ] [ i ], 0x00FF00FF, sprintf( "%s Prize Pool", ConvertPrice( g_casinoPoolData[ poolid ] [ E_POOL ] ) ) );
+			UpdateDynamic3DTextLabelText( g_casinoPoolData[ poolid ] [ E_LABEL ] [ i ], 0x00FF00FF, sprintf( "%s Prize Pool", number_format( g_casinoPoolData[ poolid ] [ E_POOL ] ) ) );
 	}
 	return 1;
 }
@@ -34189,7 +34239,7 @@ thread OnSlotMachinesLoad( )
 				// 3d Text
 				fOffsetX = 1.0 * floatsin( -rZ, degrees );
 				fOffsetY = 1.0 * floatcos( -rZ, degrees );
-				CreateDynamic3DTextLabel( sprintf( "Press ENTER To Play\n"COL_WHITE"%s Minimum", ConvertPrice( g_slotmachineData[ id ] [ E_ENTRY_FEE ] ) ), COLOR_GREY, X + fOffsetX, Y + fOffsetY, Z - 0.1, 5.0, INVALID_PLAYER_ID, INVALID_VEHICLE_ID, .testlos = 1 );
+				CreateDynamic3DTextLabel( sprintf( "Press ENTER To Play\n"COL_WHITE"%s Minimum", number_format( g_slotmachineData[ id ] [ E_ENTRY_FEE ] ) ), COLOR_GREY, X + fOffsetX, Y + fOffsetY, Z - 0.1, 5.0, INVALID_PLAYER_ID, INVALID_VEHICLE_ID, .testlos = 1 );
 
 				// Misc variables
 				g_slotmachineData[ id ] [ E_TIMER ] = -1;
@@ -34469,7 +34519,7 @@ thread OnPlayerChangeName( playerid, Float: iCoinRequirement, newName[ ] )
     	for( new i = 0; i < MAX_HOUSES; i++ ) {
     		if ( strmatch( g_houseData[ i ] [ E_OWNER ], ReturnPlayerName( playerid ) ) ) {
 				format( g_houseData[ i ] [ E_OWNER ], 24, "%s", newName );
-    			format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", g_houseData[ i ] [ E_HOUSE_NAME ], i, g_houseData[ i ] [ E_OWNER ], ConvertPrice( g_houseData[ i ] [ E_COST ] ) );
+    			format( szBigString, sizeof( szBigString ), ""COL_GOLD"House:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s", g_houseData[ i ] [ E_HOUSE_NAME ], i, g_houseData[ i ] [ E_OWNER ], number_format( g_houseData[ i ] [ E_COST ] ) );
  				UpdateDynamic3DTextLabelText( g_houseData[ i ] [ E_LABEL ] [ 0 ], COLOR_WHITE, szBigString );
     		}
     	}
@@ -34646,7 +34696,7 @@ stock ShowPlayerVehicleComponents( playerid, categoryid ) {
 	erase( szLargeString );
 
 	for( new i = 0; i < sizeof( g_vehicleComponentsData ); i++ ) if ( g_vehicleComponentsData[ i ] [ E_CATEGORY ] == categoryid ) {
-		format( szLargeString, sizeof( szLargeString ), "%s%s\t"COL_GOLD"%s\n", szLargeString, g_vehicleComponentsData[ i ] [ E_NAME ], ConvertPrice( g_vehicleComponentsData[ i ] [ E_PRICE ] ) );
+		format( szLargeString, sizeof( szLargeString ), "%s%s\t"COL_GOLD"%s\n", szLargeString, g_vehicleComponentsData[ i ] [ E_NAME ], number_format( g_vehicleComponentsData[ i ] [ E_PRICE ] ) );
 	}
 	return ShowPlayerDialog( playerid, DIALOG_COMPONENTS, DIALOG_STYLE_TABLIST, sprintf( "Pimp My Ride - %s", g_vehicleComponentsCategories[ categoryid ] ), szLargeString, "Purchase", "Back" );
 }
@@ -34716,7 +34766,7 @@ stock ShowPlayerVehicleComponentMenu( playerid, ownerid, vehicleid, i )
 		sellPrice = floatround( g_vehicleComponentsData[ pimpid ] [ E_PRICE ] * 0.5 );
 
 	SetPVarInt( playerid, "components_editing", i );
-	return ShowPlayerDialog( playerid, DIALOG_COMPONENT_EDIT, DIALOG_STYLE_TABLIST, "Vehicle Components", sprintf( "%s Component\t\nEdit Component\t\nSell Component\t"COL_GOLD"%s", g_vehiclePimpData[ ownerid ] [ vehicleid ] [ E_DISABLED ] [ i ] ? ( "Enable" ) : ( "Disable" ), ConvertPrice( sellPrice ) ), "Select", "Cancel" );
+	return ShowPlayerDialog( playerid, DIALOG_COMPONENT_EDIT, DIALOG_STYLE_TABLIST, "Vehicle Components", sprintf( "%s Component\t\nEdit Component\t\nSell Component\t"COL_GOLD"%s", g_vehiclePimpData[ ownerid ] [ vehicleid ] [ E_DISABLED ] [ i ] ? ( "Enable" ) : ( "Disable" ), number_format( sellPrice ) ), "Select", "Cancel" );
 }
 #endif
 
@@ -35366,9 +35416,9 @@ public OnPlayerHoldupStore( playerid, clerkid, step )
 
 			if ( robberyid != INVALID_OBJECT_ID && safeDistance < 100.0 && !g_robberyData[ robberyid ] [ E_STATE ] ) {
 				//g_robberyData[ robberyid ] [ E_MULTIPLIER ] = 1.1;
-				SendServerMessage( playerid, "You have successfully robbed "COL_GOLD"%s"COL_WHITE" from "COL_GREY"%s"COL_WHITE".", ConvertPrice( robbedNpc ), g_robberyNpcData[ clerkid ] [ E_NPC_NAME ], "%%" );
+				SendServerMessage( playerid, "You have successfully robbed "COL_GOLD"%s"COL_WHITE" from "COL_GREY"%s"COL_WHITE".", number_format( robbedNpc ), g_robberyNpcData[ clerkid ] [ E_NPC_NAME ], "%%" );
 			} else {
-				SendServerMessage( playerid, "You have successfully robbed "COL_GOLD"%s"COL_WHITE" from "COL_GREY"%s"COL_WHITE".", ConvertPrice( robbedNpc ), g_robberyNpcData[ clerkid ] [ E_NPC_NAME ] );
+				SendServerMessage( playerid, "You have successfully robbed "COL_GOLD"%s"COL_WHITE" from "COL_GREY"%s"COL_WHITE".", number_format( robbedNpc ), g_robberyNpcData[ clerkid ] [ E_NPC_NAME ] );
 			}
 
 			PlayerPlaySound( playerid, 5201, 0.0, 0.0, 0.0 );
@@ -35381,7 +35431,7 @@ public OnPlayerHoldupStore( playerid, clerkid, step )
 
 		GivePlayerCash( playerid, amount );
 		SetPVarInt( playerid, "robbedNpc", robbedNpc );
-		PlayerTextDrawSetString( playerid, p_RobberyAmountTD[ playerid ], sprintf( "Robbed ~g~~h~%s", ConvertPrice( robbedNpc ) ) );
+		PlayerTextDrawSetString( playerid, p_RobberyAmountTD[ playerid ], sprintf( "Robbed ~g~~h~%s", number_format( robbedNpc ) ) );
 	}
 
 	FCNPC_ApplyAnimation( npcid, "SHOP", "SHP_Rob_GiveCash", 4.1, 0, 1, 1, 1, 0 );
@@ -36115,7 +36165,7 @@ stock TriggerPlayerSlotMachine( playerid, machineid )
 		new poolContribute = floatround( float( entryFee ) * ( 1.0 - g_slotOddsPayout[ oddid ] [ E_TAX ] ) );
 
 		if ( GetPlayerCash( playerid ) < entryFee )
-			return SendError( playerid, "You must have at least %s to use this slot machine.", ConvertPrice( entryFee ) ), ( p_AutoSpin{ playerid } = false ), 1;
+			return SendError( playerid, "You must have at least %s to use this slot machine.", number_format( entryFee ) ), ( p_AutoSpin{ playerid } = false ), 1;
 
 		// Update casino pool
 		GivePlayerCasinoRewardsPoints( playerid, g_slotmachineData[ machineid ] [ E_ENTRY_FEE ], .house_edge = g_slotOddsPayout[ oddid ] [ E_TAX ] * 100.0 );
@@ -36214,7 +36264,7 @@ stock ShowRaceConfiguration( playerid, raceid )
 
 	format( szLargeString, sizeof( szLargeString ), ""COL_WHITE"The current prize pool is %s\t \n"COL_GREY"Race Mode\t%s\n"COL_GREY"Entry Fee\t%s\n"COL_GREY"Prize Distribution\t%0.0f-%0.0f-%0.0f\n",
 
-								ConvertPrice( g_raceData[ raceid ] [ E_POOL ] ), g_raceData[ raceid ] [ E_MODE ] == RACE_STREET_RACE ? ( "Streetrace" ) : ( "Outrun" ), ConvertPrice( g_raceData[ raceid ] [ E_ENTRY_FEE ] ),
+								number_format( g_raceData[ raceid ] [ E_POOL ] ), g_raceData[ raceid ] [ E_MODE ] == RACE_STREET_RACE ? ( "Streetrace" ) : ( "Outrun" ), number_format( g_raceData[ raceid ] [ E_ENTRY_FEE ] ),
 
 								100.0 * g_raceData[ raceid ] [ E_POSITION_PRIZE ] [ 0 ], 100.0 * g_raceData[ raceid ] [ E_POSITION_PRIZE ] [ 1 ], 100.0 * g_raceData[ raceid ] [ E_POSITION_PRIZE ] [ 2 ]
 							);
@@ -36344,7 +36394,7 @@ stock GivePlayerRaceWin( playerid, position, raceid )
 	foreach (new i : Player) if ( p_raceLobbyId[ i ] == raceid ) {
 		PlayerPlaySound( i, 1149, 0.0, 0.0, 0.0 );
 		GameTextForPlayer( i, sprintf( "~y~~h~%d%s~w~ %s", position, positionToString( position ), ReturnPlayerName( playerid ) ), 2000, 3 );
-		SendClientMessageFormatted( i, COLOR_GREY, "[RACE]"COL_WHITE" %s(%d) has finished the race in %d%s position (prize %s).", ReturnPlayerName( playerid ), playerid, position, positionToString( position ), ConvertPrice( prizeMoney ) );
+		SendClientMessageFormatted( i, COLOR_GREY, "[RACE]"COL_WHITE" %s(%d) has finished the race in %d%s position (prize %s).", ReturnPlayerName( playerid ), playerid, position, positionToString( position ), number_format( prizeMoney ) );
 	}
 
 	// remove from race
@@ -36622,7 +36672,7 @@ CreateBusiness( iAccountID, szBusiness[ 32 ], iPrice, iType, Float: fX, Float: f
 		g_businessData[ iBusiness ] [ E_ENTER_CP ] = CreateDynamicCP( fX, fY, fZ, 1.0, -1, 0, -1, 100.0 );
 		g_businessData[ iBusiness ] [ E_EXIT_CP ] = CreateDynamicCP( g_businessInteriorData[ iType ] [ E_X ], g_businessInteriorData[ iType ] [ E_Y ], g_businessInteriorData[ iType ] [ E_Z ], 1.0, g_businessData[ iBusiness ] [ E_WORLD ], g_businessData[ iBusiness ] [ E_INTERIOR_TYPE ] + 20, -1, 100.0 );
 
-		format( szBigString, sizeof( szBigString ), ""COL_GOLD"Business:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" No-one\n"COL_GOLD"Price:"COL_WHITE" %s\n"COL_GOLD"Members:"COL_WHITE" 0", szBusiness, iBusiness, ConvertPrice( g_businessData[ iBusiness ] [ E_COST ] ) );
+		format( szBigString, sizeof( szBigString ), ""COL_GOLD"Business:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" No-one\n"COL_GOLD"Price:"COL_WHITE" %s\n"COL_GOLD"Members:"COL_WHITE" 0", szBusiness, iBusiness, number_format( g_businessData[ iBusiness ] [ E_COST ] ) );
 	    g_businessData[ iBusiness ] [ E_ENTER_LABEL ] = CreateDynamic3DTextLabel( szBigString, COLOR_GOLD, fX, fY, fZ, 20.0 );
 		g_businessData[ iBusiness ] [ E_EXIT_LABEL ] = CreateDynamic3DTextLabel( "[EXIT]", COLOR_GOLD, g_businessInteriorData[ iType ] [ E_X ], g_businessInteriorData[ iType ] [ E_Y ], g_businessInteriorData[ iType ] [ E_Z ], 20.0 );
 
@@ -36697,7 +36747,7 @@ thread OnUpdateBusinessTitle( businessid )
 	if ( rows )
 		cache_get_field_content( 0, "NAME", szOwner );
 
-	format( szBigString, sizeof( szBigString ), ""COL_GOLD"Business:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s\n"COL_GOLD"Members:"COL_WHITE" %d", g_businessData[ businessid ] [ E_NAME ], businessid, szOwner, ConvertPrice( g_businessData[ businessid ] [ E_COST ] ), associates );
+	format( szBigString, sizeof( szBigString ), ""COL_GOLD"Business:"COL_WHITE" %s(%d)\n"COL_GOLD"Owner:"COL_WHITE" %s\n"COL_GOLD"Price:"COL_WHITE" %s\n"COL_GOLD"Members:"COL_WHITE" %d", g_businessData[ businessid ] [ E_NAME ], businessid, szOwner, number_format( g_businessData[ businessid ] [ E_COST ] ), associates );
 	UpdateDynamic3DTextLabelText( g_businessData[ businessid ] [ E_ENTER_LABEL ], COLOR_GOLD, szBigString );
 	return 1;
 }
@@ -36709,9 +36759,9 @@ stock UpdateBusinessProductionLabel( businessid )
 
 	// check if its processing
 	if ( g_businessData[ businessid ] [ E_PROD_TIMESTAMP ] != 0 && g_businessData[ businessid ] [ E_PROD_TIMESTAMP ] > g_iTime ) {
-		format( szBigString, sizeof( szBigString ), ""COL_GREEN"Bank:"COL_WHITE" %s\n"COL_GREEN"Product:"COL_WHITE" %d (%s)\n"COL_GREEN"Supplies:"COL_WHITE" %d (%s)\n"COL_ORANGE"%s until production finishes", ConvertPrice( g_businessData[ businessid ] [ E_BANK ] ), g_businessData[ businessid ] [ E_PRODUCT ], ConvertPrice( prod_price ), g_businessData[ businessid ] [ E_SUPPLIES ], ConvertPrice( supply_price ), secondstotime( g_businessData[ businessid ] [ E_PROD_TIMESTAMP ] - g_iTime, ", ", 5, 0 ) );
+		format( szBigString, sizeof( szBigString ), ""COL_GREEN"Bank:"COL_WHITE" %s\n"COL_GREEN"Product:"COL_WHITE" %d (%s)\n"COL_GREEN"Supplies:"COL_WHITE" %d (%s)\n"COL_ORANGE"%s until production finishes", number_format( g_businessData[ businessid ] [ E_BANK ] ), g_businessData[ businessid ] [ E_PRODUCT ], number_format( prod_price ), g_businessData[ businessid ] [ E_SUPPLIES ], number_format( supply_price ), secondstotime( g_businessData[ businessid ] [ E_PROD_TIMESTAMP ] - g_iTime, ", ", 5, 0 ) );
 	} else {
-		format( szBigString, sizeof( szBigString ), ""COL_GREEN"Bank:"COL_WHITE" %s\n"COL_GREEN"Product:"COL_WHITE" %d (%s)\n"COL_GREEN"Supplies:"COL_WHITE" %d (%s)\n"COL_GREEN"Production finished", ConvertPrice( g_businessData[ businessid ] [ E_BANK ] ), g_businessData[ businessid ] [ E_PRODUCT ], ConvertPrice( prod_price ), g_businessData[ businessid ] [ E_SUPPLIES ], ConvertPrice( supply_price ) );
+		format( szBigString, sizeof( szBigString ), ""COL_GREEN"Bank:"COL_WHITE" %s\n"COL_GREEN"Product:"COL_WHITE" %d (%s)\n"COL_GREEN"Supplies:"COL_WHITE" %d (%s)\n"COL_GREEN"Production finished", number_format( g_businessData[ businessid ] [ E_BANK ] ), g_businessData[ businessid ] [ E_PRODUCT ], number_format( prod_price ), g_businessData[ businessid ] [ E_SUPPLIES ], number_format( supply_price ) );
 	}
 
 	// update label
@@ -36814,7 +36864,7 @@ stock ShowBusinessTerminal( playerid )
 
 	format( szBigString, sizeof( szBigString ), "Rename Business\t"COL_GREY"%s\nWithdraw Bank Money\t"COL_GREY"%s\nManage Members\t"COL_GREY"%d %s\nSell Inventory\t"COL_GREY"%d product\nResupply Business\t"COL_GREY"%d %s\nBusiness Upgrades\t ",
 			g_businessData[ businessid ] [ E_NAME ],
-			ConvertPrice( g_businessData[ businessid ] [ E_BANK ] ),
+			number_format( g_businessData[ businessid ] [ E_BANK ] ),
 			members, members == 1 ? ( "member" ) : ( "members" ),
 			g_businessData[ businessid ] [ E_PRODUCT ],
 			g_businessData[ businessid ] [ E_SUPPLIES ], g_businessData[ businessid ] [ E_SUPPLIES ] == 1 ? ( "supply" ) : ( "supplies" )
@@ -36831,7 +36881,7 @@ stock ShowBusinessUpgrades( playerid, businessid )
 		GetVehicleName( g_businessData[ businessid ] [ E_CAR_MODEL_ID ] ), GetVehicleName( g_businessData[ businessid ] [ E_HELI_MODEL_ID ] ) );
 
 	format( szBigString, sizeof( szBigString ), "%sUpgrade Production\t"COL_GREEN"%s\nAdd Member Slot\t"COL_GREEN"%s\n", szBigString,
-		g_businessData[ businessid ] [ E_UPGRADES ] >= 1 ? ( "MAXED" ) : ( ConvertPrice( g_businessInteriorData[ business_type ] [ E_UPGRADE_COST ] ) ), g_businessData[ businessid ] [ E_EXTRA_MEMBERS ] >= 4 ? ( "MAXED" ) : ( "$500,000" ) );
+		g_businessData[ businessid ] [ E_UPGRADES ] >= 1 ? ( "MAXED" ) : ( number_format( g_businessInteriorData[ business_type ] [ E_UPGRADE_COST ] ) ), g_businessData[ businessid ] [ E_EXTRA_MEMBERS ] >= 4 ? ( "MAXED" ) : ( "$500,000" ) );
 
 	format( szBigString, sizeof( szBigString ), "%sAdd Nitrous To Car\t"COL_GREEN"%s\nAdd Gold Rims\t"COL_GREEN"%s\n", szBigString,
 		g_businessData[ businessid ] [ E_CAR_NOS ] ? ( "ADDED" ) : ( "$250,000" ), g_businessData[ businessid ] [ E_CAR_RIMS ] ? ( "ADDED" ) : ( "$250,000" ) );
@@ -36974,7 +37024,7 @@ stock SetRandomDropoffLocation( playerid, businessid, bool: heli = false )
 
 		// alert player
 		ShowPlayerHelpDialog( playerid, 5000, "Exit the facility and enter the business vehicle marked outside." );
-		SendGlobalMessage( COLOR_GREY, "[BUSINESS]"COL_WHITE" %s(%d) has begun transporting "COL_GOLD"%s"COL_WHITE" of business product!", ReturnPlayerName( playerid ), playerid, ConvertPrice( g_businessData[ businessid ] [ E_EXPORT_VALUE ] * ( MAX_DROPS - g_businessData[ businessid ] [ E_EXPORTED_AMOUNT ] ) ) );
+		SendGlobalMessage( COLOR_GREY, "[BUSINESS]"COL_WHITE" %s(%d) has begun transporting "COL_GOLD"%s"COL_WHITE" of business product!", ReturnPlayerName( playerid ), playerid, number_format( g_businessData[ businessid ] [ E_EXPORT_VALUE ] * ( MAX_DROPS - g_businessData[ businessid ] [ E_EXPORTED_AMOUNT ] ) ) );
 	}
 	else
 	{
@@ -37096,7 +37146,7 @@ stock SellBusinessProduct( playerid, businessid, locationid )
 
 	GivePlayerScore( playerid, 2 );
 	GivePlayerWantedLevel( playerid, 6 );
-	SendServerMessage( playerid, "You have successfully exported "COL_GOLD"%s"COL_WHITE" worth of product. "COL_ORANGE"(%d/%d)", ConvertPrice( product_amount ), drugsSold, MAX_DROPS );
+	SendServerMessage( playerid, "You have successfully exported "COL_GOLD"%s"COL_WHITE" worth of product. "COL_ORANGE"(%d/%d)", number_format( product_amount ), drugsSold, MAX_DROPS );
 
 	// calculate if it was the last batch
 	if ( drugsSold == MAX_DROPS )
@@ -37107,14 +37157,14 @@ stock SellBusinessProduct( playerid, businessid, locationid )
 		;
 
 		// P&L
-		SendServerMessage( playerid, "You have completed selling all business product. Total profit %s%s"COL_WHITE".", profit > 0 ? ( COL_GREEN ) : ( COL_RED ), ConvertPrice( profit ) );
+		SendServerMessage( playerid, "You have completed selling all business product. Total profit %s%s"COL_WHITE".", profit > 0 ? ( COL_GREEN ) : ( COL_RED ), number_format( profit ) );
 
 		// Destroy checkpoint and vehicle
 		StopBusinessExportMission( businessid );
 	}
 
 	// just send alerts fuck it
-	SendGlobalMessage( COLOR_GREY, "[BUSINESS]"COL_WHITE" %s(%d) has dropped off their %d%s batch of drugs for "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( playerid ), playerid, drugsSold, positionToString( drugsSold ), ConvertPrice( product_amount ) );
+	SendGlobalMessage( COLOR_GREY, "[BUSINESS]"COL_WHITE" %s(%d) has dropped off their %d%s batch of drugs for "COL_GOLD"%s"COL_WHITE"!", ReturnPlayerName( playerid ), playerid, drugsSold, positionToString( drugsSold ), number_format( product_amount ) );
 }
 
 stock ShowBusinessMembers( playerid, businessid )
@@ -37241,13 +37291,12 @@ stock ShowPlayerRewardsMenu( playerid )
 		strcat( szString, ""COL_WHITE"Item\t"COL_WHITE"Purpose\t"COL_WHITE"Rewards Points\n" );
 		for( new i; i < sizeof( g_shopItemData ); i++ ) if ( IsCasinoRewardsShopItem( i ) ) {
 			new Float: rewards_cost = ( float( g_shopItemData[ i ] [ E_PRICE ] ) * CASINO_REWARDS_COST_MP ) / CASINO_REWARDS_DIVISOR;
-	 		format( szString, sizeof( szString ), "%s%s\t"COL_GREY"%s\t"COL_GOLD"%0.2f points\n", szString, g_shopItemData[ i ] [ E_NAME ], g_shopItemData[ i ] [ E_USAGE ], rewards_cost );
+	 		format( szString, sizeof( szString ), "%s%s\t"COL_GREY"%s\t"COL_GOLD"%s points\n", szString, g_shopItemData[ i ] [ E_NAME ], g_shopItemData[ i ] [ E_USAGE ], number_format( rewards_cost, .prefix = '\0' ) );
 		}
 		for ( new i = 0; i < sizeof( g_casinoRewardsItems ); i ++ ) {
-	 		format( szString, sizeof( szString ), "%s%s\t \t"COL_GOLD"%0.2f points\n", szString, g_casinoRewardsItems[ i ] [ E_NAME ], g_casinoRewardsItems[ i ] [ E_POINTS ] );
+	 		format( szString, sizeof( szString ), "%s%s\t \t"COL_GOLD"%s points\n", szString, g_casinoRewardsItems[ i ] [ E_NAME ], number_format( g_casinoRewardsItems[ i ] [ E_POINTS ], .prefix = '\0' ) );
 		}
 	}
-	SendServerMessage( playerid, ""COL_GREY"You currently have %0.2f casino rewards points!", p_CasinoRewardsPoints[ playerid ] );
 	return ShowPlayerDialog( playerid, DIALOG_CASINO_REWARDS, DIALOG_STYLE_TABLIST_HEADERS, "{FFFFFF}Casino Rewards Items", szString, "Buy", "Cancel" );
 }
 
@@ -37258,8 +37307,19 @@ stock IsCasinoRewardsShopItem( itemid ) {
 	return false;
 }
 
+stock ShowPlayerAirportMenu( playerid )
+{
+	if ( p_CasinoRewardsPoints[ playerid ] >= 5.0 ) {
+		return ShowPlayerDialog( playerid, DIALOG_AIRPORT, DIALOG_STYLE_TABLIST_HEADERS, "{FFFFFF}Airport", ""COL_WHITE"City\t"COL_WHITE"Casino Rewards Points\nSan Fierro\t"COL_GOLD"5.00 points\nLas Venturas\t"COL_GOLD"5.00 points\nLos Santos\t"COL_GOLD"5.00 points", "Travel", "Cancel" );
+	}
+	return ShowPlayerDialog( playerid, DIALOG_AIRPORT, DIALOG_STYLE_TABLIST_HEADERS, "{FFFFFF}Airport", ""COL_WHITE"City\t"COL_WHITE"Cost\nSan Fierro\t"COL_GOLD"$2,000\nLas Venturas\t"COL_GOLD"$2,000\nLos Santos\t"COL_GOLD"$2,000", "Travel", "Cancel" );
+}
 
-
+stock GetPlayerFireworks( playerid ) return p_Fireworks[ playerid ];
+stock GivePlayerFireworks( playerid, fireworks ) {
+	p_Fireworks[ playerid ] += fireworks;
+	mysql_single_query( sprintf( "UPDATE `USERS` SET `FIREWORKS`=%d WHERE `ID`=%d", p_Fireworks[ playerid ], p_AccountID[ playerid ] ) );
+}
 
 
 
diff --git a/pawno/include/irresistible/cnr/dialog_ids.inc b/pawno/include/irresistible/cnr/dialog_ids.inc
index 253593f..e07d829 100644
--- a/pawno/include/irresistible/cnr/dialog_ids.inc
+++ b/pawno/include/irresistible/cnr/dialog_ids.inc
@@ -158,3 +158,4 @@
 #define DIALOG_BUSINESS_UPGRADES			1150
 #define DIALOG_BUSINESSES 					1151
 #define DIALOG_CASINO_REWARDS 				1152
+#define DIALOG_AIRPORT 						1153
diff --git a/pawno/include/irresistible/cnr/static/server_objects.inc b/pawno/include/irresistible/cnr/static/server_objects.inc
index fdeeaf5..69c6db2 100644
--- a/pawno/include/irresistible/cnr/static/server_objects.inc
+++ b/pawno/include/irresistible/cnr/static/server_objects.inc
@@ -1031,512 +1031,6 @@ stock initializeServerObjects( )
 	CreateDynamicObject( 2838, -1432.210449, 801.622863, 984.661987, 0.000000, 0.000000, 41.999992 );
 	CreateDynamicObject( 2894, -1427.463867, 801.275024, 984.661987, 0.000000, 0.000000, 0.000000 );
 
-	/* ** Terminal - Airport ** */
-	CreateDynamicObject(6871, -1729.1552734375, 5.8203125, 1059.8229980469, 0, 0, 270, .priority = 1);
-	CreateDynamicObject(6871, -1878.9482421875, 45.341796875, 1089.4812011719, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(6871, -1930.880859375, 5.8134765625, 1089.4812011719, 0, 179.99450683594, 90, .priority = 1);
-	CreateDynamicObject(6871, -1878.2841796875, -51.939453125, 1095.3131103516, 0, 179.99450683594, 179.99450683594, .priority = 1);
-	CreateDynamicObject(6871, -1823.28515625, -51.9453125, 1095.3131103516, 0, 179.99450683594, 179.99450683594, .priority = 1);
-	CreateDynamicObject(6871, -1768.408203125, -51.9501953125, 1095.3131103516, 0, 179.99450683594, 179.99450683594, .priority = 1);
-	CreateDynamicObject(6871, -1825.6796875, 45.4482421875, 1099.4812011719, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(6871, -1882.5126953125, 41.7646484375, 1089.4812011719, 0, 179.99450683594, 90, .priority = 1);
-	CreateDynamicObject(6871, -1762.2412109375, 45.515625, 1089.4812011719, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(6364, -1925.533203125, -23.0546875, 1068.1417236328, 0, 0, 350.24963378906, .priority = 1);
-	CreateDynamicObject(6989, -1737.9873046875, -5.5458984375, 977.18237304688, 0, 270, 0, .priority = 1);
-	CreateDynamicObject(6989, -1924.0791015625, 3.8291015625, 977.20001220703, 0, 269.98901367188, 179.99450683594, .priority = 1);
-	CreateDynamicObject(6871, -1770.703125, 45.45703125, 1099.4812011719, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(6871, -1758.634765625, 41.912109375, 1089.4812011719, 0, 179.99450683594, 270, .priority = 1);
-	CreateDynamicObject(6871, -1776.5986328125, 78.5029296875, 1094.4812011719, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(2774, -1780.8916015625, -10.5615234375, 1054.1915283203, 0, 0, 0, .priority = 1);
-	CreateDynamicObject(6871, -1834.7001953125, 57.6005859375, 1089.4812011719, 0, 179.99450683594, 90, .priority = 1);
-	CreateDynamicObject(6989, -1715.3359375, 35.259765625, 977.18237304688, 0, 270, 0, .priority = 1);
-	CreateDynamicObject(10056, -1786.4560546875, -92.837890625, 1097.2132568359, 0, 0, 90.247192382813, .priority = 1);
-	CreateDynamicObject(10056, -1869.4072265625, -93.13671875, 1097.2132568359, 0, 0, 90.247192382813, .priority = 1);
-	CreateDynamicObject(10056, -1687.4693603516, -92.780113220215, 1097.2132568359, 0, 0, 90.247192382813, .priority = 1);
-	CreateDynamicObject(6871, -1922.783203125, 6.017578125, 1037.8953857422, 179.99450683594, 179.99450683594, 90, .priority = 1);
-	CreateDynamicObject(6871, -1776.8994140625, 88.6884765625, 1089.4812011719, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(10056, -1950.7564697266, -93.511184692383, 1097.2132568359, 0, 0, 90.247192382813, .priority = 1);
-	CreateDynamicObject(6871, -1831.123046875, 61.2001953125, 1089.4812011719, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(2774, -1821.5484619141, -23.6262550354, 1066.3145751953, 90, 0, 0.98876953125, .priority = 1);
-	CreateDynamicObject(2774, -1884.48046875, -10.203125, 1066.4146728516, 90, 0, 179.98352050781, .priority = 1);
-	CreateDynamicObject(2774, -1884.4189453125, -19.099378585815, 1060.9146728516, 90, 0, 179.98352050781, .priority = 1);
-	CreateDynamicObject(2774, -1896.7272949219, -6.9482502937317, 1060.9146728516, 90, 0, 269.98352050781, .priority = 1);
-	CreateDynamicObject(2774, -1884.4360351563, -7.1410775184631, 1054.1915283203, 0, 0, 0, .priority = 1);
-	CreateDynamicObject(6871, -1752.9091796875, 39.615234375, 1037.9250488281, 179.99450683594, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(2774, -1780.9765625, 13.606979370117, 1054.1915283203, 0, 0, 0, .priority = 1);
-	CreateDynamicObject(2774, -1780.904296875, 1.3359375, 1066.4146728516, 90, 0, 0, .priority = 1);
-	CreateDynamicObject(2774, -1792.728515625, -10.71875, 1066.3145751953, 90, 0, 90.999755859375, .priority = 1);
-	CreateDynamicObject(2774, -1884.46484375, -0.0830078125, 1066.3896484375, 90, 0, 179.99951171875, .priority = 1);
-	CreateDynamicObject(2774, -1816.3173828125, -11.15625, 1066.3145751953, 90, 0, 90.98876953125, .priority = 1);
-	CreateDynamicObject(2774, -1839.9267578125, -11.51953125, 1066.3145751953, 90, 0, 90.98876953125, .priority = 1);
-	CreateDynamicObject(2774, -1863.27734375, -11.9716796875, 1066.2895507813, 90, 0, 90.98876953125, .priority = 1);
-	CreateDynamicObject(2774, -1871.9477539063, -12.132898330688, 1066.3646240234, 90, 0, 90.98876953125, .priority = 1);
-	CreateDynamicObject(2774, -1884.46484375, 3.4208984375, 1066.3896484375, 90, 0, 179.99450683594, .priority = 1);
-	CreateDynamicObject(2774, -1865.4638671875, 6.7841796875, 1066.3896484375, 90, 0, 269.98901367188, .priority = 1);
-	CreateDynamicObject(2774, -1871.8046875, 6.8046875, 1066.3896484375, 90, 0, 269.98901367188, .priority = 1);
-	CreateDynamicObject(2774, -1852.990234375, 19.1875, 1066.4396972656, 90, 0, 359.97802734375, .priority = 1);
-	CreateDynamicObject(2774, -1852.5556640625, 7.2333984375, 1054.1414794922, 0, 0, 0, .priority = 1);
-	CreateDynamicObject(6959, -1760.951171875, -3.5728607177734, 1066.5623779297, 0, 0, 0, .priority = 1);
-	CreateDynamicObject(6959, -1801.5708007813, -31.228803634644, 1066.5623779297, 0, 0, 90, .priority = 1);
-	CreateDynamicObject(6959, -1761.501953125, -3.5517454147339, 1067.3131103516, 0, 0, 0, .priority = 1);
-	CreateDynamicObject(6959, -1802.142578125, -30.83984375, 1067.3131103516, 0, 0, 90, .priority = 1);
-	CreateDynamicObject(6959, -1842.0390625, -30.8232421875, 1067.3131103516, 0, 0, 90, .priority = 1);
-	CreateDynamicObject(6959, -1872.0546875, 26.498046875, 1067.3131103516, 0, 0, 90, .priority = 1);
-	CreateDynamicObject(6959, -1881.9921875, -30.830078125, 1067.3131103516, 0, 0, 90, .priority = 1);
-	CreateDynamicObject(6959, -1904.7421875, 9.662109375, 1067.3131103516, 0, 0, 0, .priority = 1);
-	CreateDynamicObject(8661, -1874.5, -21.853515625, 1060.4177246094, 90, 90, 270, .priority = 1);
-	CreateDynamicObject(8661, -1834.51171875, -21.8779296875, 1060.4177246094, 90, 90, 270, .priority = 1);
-	CreateDynamicObject(8661, -1794.7626953125, -21.8515625, 1060.4177246094, 90, 90, 270, .priority = 1);
-	CreateDynamicObject(8661, -1754.9833984375, -21.8251953125, 1060.4177246094, 90, 90, 270, .priority = 1);
-	CreateDynamicObject(8661, -1827.08203125, 24.5849609375, 1060.4177246094, 90, 90, 90, .priority = 1);
-	CreateDynamicObject(8661, -1829.6279296875, 32.2744140625, 1061.6574707031, 179.99450683594, 0, 0, .priority = 1);
-	CreateDynamicObject(6959, -1872.2642822266, 26.90641784668, 1066.2370605469, 0, 0, 90, .priority = 1);
-	CreateDynamicObject(6959, -1904.7421875, 9.662109375, 1065.9868164063, 0, 0, 0, .priority = 1);
-	CreateDynamicObject(6959, -1905.8361816406, -29.319580078125, 1065.9868164063, 0, 0, 0, .priority = 1);
-	CreateDynamicObject(8661, -1807.1010742188, 40.971714019775, 1060.4177246094, 90, 90, 0, .priority = 1);
-	CreateDynamicObject(8661, -1809.443359375, 24.39453125, 1069.9992675781, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(8661, -1809.2485351563, 42.453460693359, 1069.9992675781, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(8661, -1808.6362304688, 61.353233337402, 1069.9992675781, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(8661, -1832.9326171875, 24.6484375, 1069.9992675781, 0, 179.99450683594, 0, .priority = 1);
-	CreateDynamicObject(10310, -1763.7945556641, -5.4736223220825, 1078.5191650391, 0, 0, 133.9892578125, -1, -1, -1, 250.0);
-	CreateDynamicObject(10308, -1730.7578125, -92.7919921875, 1097.0695800781, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(10060, -1790.1005859375, -0.3857421875, 1110.2736816406, 0, 179.99450683594, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(10060, -1849.7724609375, -0.3818359375, 1110.2736816406, 0, 179.99450683594, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(10060, -1906.5078125, 2.6953125, 1110.2736816406, 0, 179.99450683594, 349.99694824219, -1, -1, -1, 250.0);
-	CreateDynamicObject(3586, -1788.662109375, 1.29296875, 1063.8564453125, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(3586, -1860.6865234375, -3.6572265625, 1063.8564453125, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(13562, -1763.78125, -16.970703125, 1068.7208251953, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2922, -1845.365234375, 19.899791717529, 1061.8756103516, 0, 0, 180, -1, -1, -1, 250.0);
-	CreateDynamicObject(2885, -1847.1171875, 20.0859375, 1067.1202392578, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1533, -1847.2280273438, 19.832950592041, 1060.4123535156, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1533, -1789.8630371094, 26.544826507568, 1060.4094238281, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(1533, -1894.3205566406, -16.360830307007, 1060.4211425781, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(1566, -1808.1375732422, -21.615396499634, 1061.9248046875, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1566, -1804.9873046875, -21.6015625, 1061.9248046875, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1566, -1802.158203125, -21.61191368103, 1061.9248046875, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1566, -1798.9821777344, -21.60608291626, 1061.9248046875, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1566, -1855.5906982422, -21.613245010376, 1061.9248046875, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1566, -1858.7205810547, -21.61484336853, 1061.9248046875, 0, 0, 359.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1566, -1864.7797851563, -21.599769592285, 1061.9248046875, 0, 0, 359.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1566, -1861.646484375, -21.5712890625, 1061.9248046875, 0, 0, 179.98352050781, -1, -1, -1, 250.0);
-	CreateDynamicObject(2885, -1847.1171875, 20.0859375, 1073.8111572266, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2885, -1833.8364257813, 25.709087371826, 1067.1202392578, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2885, -1827.6228027344, 25.735401153564, 1067.1202392578, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2885, -1816.4072265625, 25.74609375, 1067.1202392578, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(10757, -1829.787109375, 1.287109375, 1082.6239013672, 0, 0, 355.74279785156, -1, -1, -1, 250.0);
-	CreateDynamicObject(8550, -1796.6313476563, 64.369018554688, 1064.6574707031, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2775, -1846.6135253906, 19.35160446167, 1065.3563232422, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2469, -1832.9814453125, 21.808559417725, 1061.5343017578, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1833.2548828125, 14.1162109375, 1060.9266357422, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1830.9296875, 14.128261566162, 1060.9266357422, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1828.5793457031, 14.114841461182, 1060.9266357422, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1826.2297363281, 14.101169586182, 1060.9266357422, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1823.8298339844, 14.087219238281, 1060.9266357422, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1821.4787597656, 14.073825836182, 1060.9266357422, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1819.1031494141, 14.060014724731, 1060.9266357422, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1838.916015625, 15.558530807495, 1060.9266357422, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1838.9158935547, 17.4582862854, 1060.9266357422, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1572, -1806.2822265625, 19.399620056152, 1060.9801025391, 0, 0, 310, -1, -1, -1, 250.0);
-	CreateDynamicObject(1572, -1850.8558349609, 15.31520652771, 1060.9835205078, 0, 0, 1.9945068359375, -1, -1, -1, 250.0);
-	CreateDynamicObject(1572, -1897.421875, -9.8848896026611, 1067.8543701172, 0, 0, 229.98779296875, -1, -1, -1, 250.0);
-	CreateDynamicObject(3970, -1781.2822265625, -19.080078125, 1061.4990234375, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3970, -1769.4478759766, -19.015478134155, 1061.4990234375, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2794, -1790.74609375, 37.072265625, 1063.3648681641, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2797, -1854.1356201172, 45.019668579102, 1056.3999023438, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2795, -1802.6752929688, 37.107730865479, 1063.4113769531, 0, 0, 180, -1, -1, -1, 250.0);
-	CreateDynamicObject(1533, -1803.4904785156, 36.285415649414, 1060.4094238281, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2797, -1796.5506591797, 54.803707122803, 1066.0627441406, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1892, -1801.0637207031, -20.75661277771, 1060.5095214844, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1892, -1807.12109375, -20.9150390625, 1060.5095214844, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1892, -1857.701171875, -21.0107421875, 1060.5095214844, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1892, -1863.7763671875, -21.0634765625, 1060.5095214844, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1892, -1798.3446044922, 47.69310760498, 1060.4094238281, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2790, -1836.6491699219, 14.21311378479, 1073.9184570313, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2789, -1817.4311523438, 14.232239723206, 1073.9184570313, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1893.9711914063, -2.7453513145447, 1061.0791015625, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1811.3720703125, 2.40234375, 1061.0688476563, 0, 0, 269.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1811.3544921875, 1.67578125, 1061.0688476563, 0, 0, 89.989013671875, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1822.7578125, 1.5859375, 1061.0688476563, 0, 0, 89.989013671875, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1822.7762451172, 2.3636999130249, 1061.0688476563, 0, 0, 269.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1834.1845703125, 1.6865234375, 1061.0688476563, 0, 0, 89.989013671875, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1834.1585693359, 2.411497592926, 1061.0688476563, 0, 0, 269.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(3586, -1875.7060546875, -3.7431640625, 1063.8564453125, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2775, -1792.0953369141, 47.223445892334, 1066.7923583984, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1792.8936767578, 47.472255706787, 1060.9266357422, 0, 0, 89.97802734375, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1790.9678955078, 47.461292266846, 1060.9266357422, 0, 0, 89.97802734375, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1800.57421875, 47.4326171875, 1060.9266357422, 0, 0, 89.97802734375, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1802.5056152344, 47.430358886719, 1060.9266357422, 0, 0, 89.97802734375, -1, -1, -1, 250.0);
-	CreateDynamicObject(1892, -1796.0665283203, 47.70240020752, 1060.4094238281, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3858, -1786.7071533203, 47.879127502441, 1063.3211669922, 0, 0, 224, -1, -1, -1, 250.0);
-	CreateDynamicObject(3858, -1786.70703125, 47.87890625, 1063.3211669922, 0, 0, 223.99475097656, -1, -1, -1, 250.0);
-	CreateDynamicObject(3858, -1806.7238769531, 48.135746002197, 1063.3211669922, 0, 0, 223.99475097656, -1, -1, -1, 250.0);
-	CreateDynamicObject(3858, -1806.7236328125, 48.1357421875, 1063.3211669922, 0, 0, 223.99475097656, -1, -1, -1, 250.0);
-	CreateDynamicObject(3858, -1798.1241455078, 48.007026672363, 1066.9321289063, 0, 0, 223.99475097656, -1, -1, -1, 250.0);
-	CreateDynamicObject(2632, -1857.029296875, -20.440763473511, 1060.4606933594, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2631, -1860.4167480469, 3.9738006591797, 1060.4149169922, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2631, -1875.0828857422, 3.9939117431641, 1060.4149169922, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2631, -1796.3670654297, 1.3126888275146, 1060.4558105469, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2632, -1863.0042724609, -20.421146392822, 1060.4606933594, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2632, -1806.58203125, -20.628778457642, 1060.4558105469, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2632, -1800.431640625, -20.726125717163, 1060.4558105469, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3440, -1794.2462158203, 47.938587188721, 1062.7858886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3440, -1799.1689453125, 48.0986328125, 1062.7858886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3440, -1803.5416259766, 47.980197906494, 1062.7858886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3440, -1789.7956542969, 47.945510864258, 1062.7858886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2754, -1806.654296875, 23.292640686035, 1061.3115234375, 0, 0, 180, -1, -1, -1, 250.0);
-	CreateDynamicObject(2754, -1865.1431884766, 13.719929695129, 1061.3178710938, 0, 0, 89.994506835938, -1, -1, -1, 250.0);
-	CreateDynamicObject(2754, -1864.1915283203, 13.709921836853, 1061.3178710938, 0, 0, 89.994506835938, -1, -1, -1, 250.0);
-	CreateDynamicObject(1523, -1861.1318359375, 11.10546875, 1067.2738037109, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(3389, -1806.0949707031, 29.721864700317, 1060.4094238281, 0, 0, 89.994506835938, -1, -1, -1, 250.0);
-	CreateDynamicObject(3389, -1805.0849609375, 29.72265625, 1060.4094238281, 0, 0, 89.994506835938, -1, -1, -1, 250.0);
-	CreateDynamicObject(2754, -1806.666015625, 24.2431640625, 1061.3115234375, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2921, -1803.7005615234, 56.910552978516, 1064.0384521484, 0, 0, 155.99523925781, -1, -1, -1, 250.0);
-	CreateDynamicObject(2791, -1796.9093017578, 47.326625823975, 1074.3138427734, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2775, -1801.2761230469, 47.324184417725, 1066.7923583984, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2714, -1761.5598144531, -3.8049967288971, 1072.3830566406, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2599, -1799.4293212891, 45.762767791748, 1060.8731689453, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2430, -1760.3795166016, 0.74860960245132, 1070.2830810547, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2643, -1760.3098144531, -0.94232320785522, 1072.7652587891, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(7313, -1760.85546875, -0.748046875, 1065.4918212891, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(9191, -1830.4586181641, -21.065053939819, 1080.10546875, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(9314, -1831.1212158203, -21.499507904053, 1062.1694335938, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(1533, -1762.271484375, -21.564918518066, 1060.4094238281, 0, 0, 180, -1, -1, -1, 250.0);
-	CreateDynamicObject(2942, -1788.3039550781, 13.964742660522, 1061.0523681641, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2942, -1787.5529785156, 13.950849533081, 1061.0523681641, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2942, -1786.8270263672, 13.937611579895, 1061.0523681641, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2941, -1765.8701171875, 0.5654296875, 1068.6260986328, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2712, -1786.2185058594, 14.119216918945, 1060.9793701172, 0, 0, 160, -1, -1, -1, 250.0);
-	CreateDynamicObject(2994, -1784.4299316406, 13.998746871948, 1060.9116210938, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1817.4975585938, -26.28554725647, 1060.8029785156, 0, 0, 144.48901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1846.3095703125, -26.216796875, 1060.8029785156, 0, 0, 36.485595703125, -1, -1, -1, 250.0);
-	CreateDynamicObject(2793, -1790.5411376953, 25.800407409668, 1063.4813232422, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3526, -1806.6301269531, 21.483982086182, 1060.4777832031, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(3526, -1806.630859375, 22.3330078125, 1060.4777832031, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(982, -1794.9521484375, -10.2275390625, 1067.9573974609, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2011, -1782.451171875, 13.7074842453, 1060.4094238281, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3439, -1763.8330078125, 14.140625, 1064.5228271484, 0, 0, 101.99710083008, -1, -1, -1, 250.0);
-	CreateDynamicObject(1597, -1840.9217529297, -19.701704025269, 1063.0666503906, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(1597, -1830.5941162109, -18.994815826416, 1069.9410400391, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(1597, -1822.380859375, -19.869140625, 1063.0666503906, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(1364, -1822.4818115234, -17.659080505371, 1061.1936035156, 0, 0, 180, -1, -1, -1, 250.0);
-	CreateDynamicObject(1364, -1840.7106933594, -17.492065429688, 1061.1936035156, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1360, -1860.0284423828, -20.52586555481, 1061.1867675781, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1360, -1803.5942382813, -20.371788024902, 1061.1813964844, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(626, -1868.8028564453, -21.020046234131, 1062.4650878906, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(626, -1851.3592529297, -20.842357635498, 1062.4650878906, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(626, -1812.37890625, -20.4453125, 1062.4650878906, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(626, -1794.5740966797, -20.264497756958, 1062.4650878906, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(626, -1791.7015380859, 52.629512786865, 1062.4580078125, 0, 0, 60, -1, -1, -1, 250.0);
-	CreateDynamicObject(626, -1801.0483398438, 52.846202850342, 1062.4580078125, 0, 0, 59.996337890625, -1, -1, -1, 250.0);
-	CreateDynamicObject(1346, -1810.4498291016, -33.784622192383, 1061.4945068359, 0, 0, 88, -1, -1, -1, 250.0);
-	CreateDynamicObject(1363, -1855.7933349609, 11.710659980774, 1061.2502441406, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(717, -1837.2769775391, -1.0393017530441, 1060.6062011719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(18074, -1830.2275390625, -2.9306640625, 1088.1741943359, 90, 90, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(18074, -1829.9163818359, 7.2397017478943, 1086.69921875, 90, 90, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(18074, -1838.8546142578, -1.5747513771057, 1086.298828125, 90, 90, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(18074, -1820.8581542969, -1.4859480857849, 1089.1931152344, 90, 90, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(18074, -1830.0379638672, 1.032731294632, 1087.4484863281, 90, 90, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1346, -1810.4412841797, -32.459255218506, 1061.4945068359, 0, 0, 87.994995117188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1363, -1857.79296875, 11.722396850586, 1061.2502441406, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1363, -1860.1673583984, 11.73644733429, 1061.2502441406, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1257, -1797.2928466797, -62.085174560547, 1059.3858642578, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(1257, -1874.5081787109, -61.880577087402, 1059.3858642578, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(1257, -1864.7625732422, -62.141872406006, 1059.3858642578, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(1257, -1788.5212402344, -62.320751190186, 1059.3858642578, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(1346, -1867.0059814453, -33.926624298096, 1061.4945068359, 0, 0, 87.994995117188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1346, -1866.9561767578, -32.52668762207, 1061.4945068359, 0, 0, 87.994995117188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1258, -1851.3392333984, -34.376541137695, 1060.8052978516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1258, -1793.4044189453, -35.227462768555, 1060.8052978516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1258, -1850.513671875, -34.3935546875, 1060.8052978516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1258, -1794.3044433594, -35.229629516602, 1060.8052978516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1290, -1793.2397460938, -62.046653747559, 1059.1265869141, 0, 0, 180, -1, -1, -1, 250.0);
-	CreateDynamicObject(1290, -1869.6401367188, -62.205978393555, 1059.1265869141, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1340, -1773.365234375, -18.463106155396, 1068.4094238281, 0, 0, 89.9990234375, -1, -1, -1, 250.0);
-	CreateDynamicObject(1342, -1776.2850341797, -18.494663238525, 1068.3155517578, 0, 0, 88, -1, -1, -1, 250.0);
-	CreateDynamicObject(1341, -1770.8393554688, -18.730419158936, 1068.2844238281, 0, 0, 91.994018554688, -1, -1, -1, 250.0);
-	CreateDynamicObject(1351, -1822.6796875, -49.773448944092, 1057.9641113281, 0, 0, 100, -1, -1, -1, 250.0);
-	CreateDynamicObject(1351, -1881.3825683594, -49.689235687256, 1057.9641113281, 0, 0, 99.99755859375, -1, -1, -1, 250.0);
-	CreateDynamicObject(1571, -1816.3427734375, -63.268230438232, 1059.4375, 0, 0, 180, -1, -1, -1, 250.0);
-	CreateDynamicObject(1775, -1876.0203857422, -21.368055343628, 1061.5148925781, 0, 0, 180, -1, -1, -1, 250.0);
-	CreateDynamicObject(717, -1807.6484375, -1.3422487974167, 1060.6062011719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(982, -1782.134765625, 16.078125, 1067.9573974609, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(984, -1884.0947265625, -3.7099609375, 1067.9573974609, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(983, -1782.1806640625, -3.8369140625, 1067.9573974609, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(983, -1865.8076171875, -10.2490234375, 1067.9573974609, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(982, -1820.5234375, -10.2578125, 1067.9573974609, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(982, -1846.07421875, -10.2626953125, 1067.9573974609, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(983, -1782.1650390625, -7.01171875, 1067.9573974609, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(983, -1870.58203125, -10.2392578125, 1067.9573974609, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(983, -1880.83203125, -10.111328125, 1067.9573974609, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(984, -1884.0830078125, -0.509765625, 1067.9573974609, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(982, -1871.2998046875, 5.962890625, 1067.9573974609, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2403, -1895.7265625, 8.5380859375, 1066.9484863281, 0, 0, 43.994750976563, -1, -1, -1, 250.0);
-	CreateDynamicObject(2403, -1885.875, 7.984375, 1066.9234619141, 0, 0, 39.48486328125, -1, -1, -1, 250.0);
-	CreateDynamicObject(2385, -1884.1937255859, 5.4506101608276, 1067.298828125, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2385, -1884.2041015625, 3.28125, 1067.298828125, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2385, -1884.19140625, 1.1552734375, 1067.298828125, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2376, -1892.79296875, 5.046875, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2376, -1892.8125, 2.5703125, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2376, -1892.765625, 0.2939453125, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2375, -1899.505859375, 7.5068359375, 1067.1486816406, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2368, -1897.353515625, 7.565541267395, 1067.1737060547, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2369, -1897.5107421875, 7.6474609375, 1068.1899414063, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2366, -1781.6845703125, -6.712890625, 1067.1987304688, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2365, -1897.3771972656, 6.9224400520325, 1067.2818603516, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2362, -1897.7778320313, 9.5859375, 1068.2399902344, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2387, -1892.2882080078, -1.9280413389206, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2387, -1890.8924560547, -1.9591312408447, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2394, -1884.615234375, 4.8359375, 1068.1646728516, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2394, -1884.658203125, 2.7607421875, 1068.1646728516, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2394, -1884.7041015625, 0.560546875, 1068.1646728516, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2386, -1892.1435546875, 3.263671875, 1067.7233886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2386, -1891.1171875, 3.2783203125, 1067.7233886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2386, -1892.0693359375, 1.0087890625, 1067.7233886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2384, -1891.0947265625, 0.24609375, 1067.7233886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2384, -1892.0439453125, 0.2578125, 1067.7233886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2384, -1890.9555664063, 2.6175153255463, 1067.7233886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2384, -1892.166015625, 2.4814453125, 1067.7233886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2384, -1892.1982421875, 4.9560546875, 1067.7233886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2384, -1890.947265625, 4.9716796875, 1067.7233886719, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2407, -1891.4649658203, -3.2949588298798, 1069.5345458984, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2054, -1891.0338134766, 2.9143064022064, 1068.5589599609, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(18070, -1897.3505859375, -16.1494140625, 1067.7834472656, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(14890, -1896.0529785156, -13.214859962463, 1068.3272705078, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2371, -1884.8984375, -7.91796875, 1067.2487792969, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2378, -1885.458984375, -6.828248500824, 1067.8260498047, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2377, -1885.462890625, -7.740234375, 1067.8087158203, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2371, -1884.9375, -4.6171875, 1067.2738037109, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2377, -1885.4755859375, -4.5679693222046, 1067.8587646484, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2377, -1885.4462890625, -3.568359375, 1067.8587646484, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(1523, -1891.314453125, 11.9736328125, 1067.2738037109, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1889.310546875, 15.3291015625, 1067.0235595703, 0, 0, 259.99694824219, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1891.330078125, 12.6357421875, 1067.0235595703, 0, 0, 101.99157714844, -1, -1, -1, 250.0);
-	CreateDynamicObject(2723, -1890.59375, 13.900390625, 1067.5168457031, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2843, -1890.70703125, 12.724771499634, 1067.2738037109, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1885, -1895.7320556641, -12.087652206421, 1067.2836914063, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1881.2373046875, 11.71484375, 1066.7482910156, 0, 0, 101.98608398438, -1, -1, -1, 250.0);
-	CreateDynamicObject(1597, -1830.6611328125, -11.1640625, 1069.9410400391, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(18092, -1889.0537109375, -14.3857421875, 1067.7836914063, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(18092, -1889.068359375, -17.8349609375, 1067.7836914063, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(18092, -1889.068359375, -17.8349609375, 1067.7836914063, 0, 0, 359.98352050781, -1, -1, -1, 250.0);
-	CreateDynamicObject(2053, -1891.748046875, 0.5966796875, 1068.5932617188, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2052, -1891.0283203125, 0.6162109375, 1068.5589599609, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2424, -1765.83203125, 0.548828125, 1067.2738037109, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2424, -1765.7685546875, -2.0224609375, 1067.2738037109, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2423, -1765.7744140625, -2.947265625, 1067.2738037109, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2423, -1765.7607421875, 1.578125, 1067.2738037109, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2436, -1765.8603515625, -0.3876953125, 1067.2738037109, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2445, -1765.572265625, -8.794921875, 1067.2487792969, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2484, -1890.1208496094, -17.826852798462, 1069.1184082031, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2491, -1891.1730957031, -3.0028619766235, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2449, -1764.2270507813, -7.4019269943237, 1066.7482910156, 0, 0, 1.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2445, -1765.5439453125, -9.76953125, 1067.2487792969, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2445, -1765.51171875, -10.7685546875, 1067.2487792969, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2445, -1765.48046875, -11.7666015625, 1067.2487792969, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2415, -1761.0693359375, 0.40234375, 1067.2237548828, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2415, -1760.9833984375, -11.453538894653, 1067.2818603516, 0, 0, 267.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2361, -1762.8791503906, 1.6457473039627, 1067.2237548828, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2424, -1764.859375, 1.583984375, 1067.2738037109, 0, 0, 181.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2424, -1763.931640625, 1.623526930809, 1067.2738037109, 0, 0, 181.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2360, -1760.9039306641, -7.7782363891602, 1067.2818603516, 0, 0, 272, -1, -1, -1, 250.0);
-	CreateDynamicObject(2417, -1760.8779296875, -1.2705078125, 1067.2487792969, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2417, -1760.9248046875, -0.396484375, 1067.2487792969, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2294, -1760.9682617188, -2.2261819839478, 1067.1737060547, 0, 0, 273.9990234375, -1, -1, -1, 250.0);
-	CreateDynamicObject(2294, -1760.9044189453, -3.1740863323212, 1067.1737060547, 0, 0, 273.99353027344, -1, -1, -1, 250.0);
-	CreateDynamicObject(2445, -1765.6015625, -7.794921875, 1067.2487792969, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2294, -1760.9809570313, -10.381266593933, 1067.2818603516, 0, 0, 268.24353027344, -1, -1, -1, 250.0);
-	CreateDynamicObject(2294, -1760.9636230469, -9.3290185928345, 1067.2818603516, 0, 0, 269.99353027344, -1, -1, -1, 250.0);
-	CreateDynamicObject(2102, -1765.6220703125, -8.4892578125, 1068.279296875, 0, 0, 273.9990234375, -1, -1, -1, 250.0);
-	CreateDynamicObject(2420, -1781.9307861328, -3.3887295722961, 1067.2487792969, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2420, -1781.921875, -4.037109375, 1067.2487792969, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2420, -1781.8876953125, 5.7119140625, 1067.2767333984, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2420, -1781.8837890625, 6.361328125, 1067.2738037109, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2453, -1764.91796875, 1.5810546875, 1068.6575927734, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2663, -1765.4443359375, -10.130859375, 1068.5340576172, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2941, -1765.5080566406, -11.641445159912, 1068.6761474609, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(932, -1893.4071044922, -4.659903049469, 1060.4190673828, 0, 0, 119.99267578125, -1, -1, -1, 250.0);
-	CreateDynamicObject(1432, -1771.5028076172, -0.2907018661499, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1432, -1776.7280273438, -5.4922189712524, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1432, -1771.2952880859, -5.6720957756042, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1432, -1776.6881103516, -0.60116243362427, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1432, -1776.2415771484, -10.298135757446, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1432, -1770.9033203125, -13.5556640625, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1432, -1770.88671875, -10.150146484375, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1432, -1779.6884765625, -14.033807754517, 1067.2818603516, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2366, -1781.640625, -8.3359375, 1067.1987304688, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2366, -1781.62890625, -9.9384765625, 1067.2237548828, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1670, -1765.974609375, -2.3037109375, 1068.3543701172, 0, 0, 283.99658203125, -1, -1, -1, 250.0);
-	CreateDynamicObject(2125, -1766.3923339844, -10.803741455078, 1067.55859375, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2125, -1766.4267578125, -9.4052734375, 1067.55859375, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2125, -1766.455078125, -8.0029296875, 1067.55859375, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2818, -1767.33203125, -0.2548828125, 1067.298828125, 0, 0, 271.99951171875, -1, -1, -1, 250.0);
-	CreateDynamicObject(14657, -1766.8251953125, 17.3896484375, 1067.8812255859, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(3657, -1814.8775634766, -34.067047119141, 1060.6617431641, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3657, -1870.9949951172, -33.927833557129, 1060.6617431641, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3512, -1773.0650634766, -8.6108512878418, 1067.2818603516, 0, 0, 177.99499511719, -1, -1, -1, 250.0);
-	CreateDynamicObject(3512, -1773.7021484375, -3.5947265625, 1067.2818603516, 0, 0, 115.98815917969, -1, -1, -1, 250.0);
-	CreateDynamicObject(646, -1765.775390625, -3.9921875, 1068.6652832031, 0, 0, 83.990478515625, -1, -1, -1, 250.0);
-	CreateDynamicObject(646, -1765.7451171875, -6.7666015625, 1068.6652832031, 0, 0, 83.984985351563, -1, -1, -1, 250.0);
-	CreateDynamicObject(640, -1773.5185546875, 12.187517166138, 1068.0051269531, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(640, -1773.603515625, 5.146484375, 1068.0051269531, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(640, -1771.2255859375, 2.8427734375, 1068.0051269531, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(640, -1766.0927734375, 2.845703125, 1068.0051269531, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(640, -1760.82421875, 2.837890625, 1068.0051269531, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(3920, -1760.1845703125, 8.8857421875, 1070.5693359375, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(3920, -1773.3828125, 8.8037109375, 1070.5693359375, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(3920, -1767.240234375, 2.6044921875, 1070.5693359375, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(14657, -1766.7478027344, 10.966611862183, 1067.8812255859, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(3115, -1763.0440673828, 11.769790649414, 1071.2741699219, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1808, -1760.6029052734, 8.5422172546387, 1067.2738037109, 0, 0, 267.99499511719, -1, -1, -1, 250.0);
-	CreateDynamicObject(10444, -1766.0260009766, 13.431004524231, 1053.0162353516, 90, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(10444, -1758.0589599609, 20.647151947021, 1068.1696777344, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(1603, -1760.5749511719, 14.143070220947, 1068.5760498047, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1603, -1761.119140625, 13.879629135132, 1068.5760498047, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1603, -1761.46875, 14.254022598267, 1068.5760498047, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1601, -1764.3555908203, 14.267934799194, 1068.0053710938, 0, 0, 88, -1, -1, -1, 250.0);
-	CreateDynamicObject(1601, -1764.7542724609, 14.295259475708, 1068.0053710938, 0, 0, 87.994995117188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1601, -1767.1708984375, 14.4619140625, 1068.0053710938, 0, 0, 87.989501953125, -1, -1, -1, 250.0);
-	CreateDynamicObject(1601, -1768.2922363281, 14.539766311646, 1068.0053710938, 0, 0, 87.994995117188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1601, -1771.119140625, 14.35546875, 1068.0053710938, 0, 0, 93.993530273438, -1, -1, -1, 250.0);
-	CreateDynamicObject(1601, -1769.263671875, 14.3125, 1068.0053710938, 0, 0, 93.993530273438, -1, -1, -1, 250.0);
-	CreateDynamicObject(1609, -1769.1584472656, 14.601585388184, 1067.2020263672, 0, 0, 258, -1, -1, -1, 250.0);
-	CreateDynamicObject(1599, -1769.357421875, 13.9609375, 1068.2393798828, 19.9951171875, 0, 275.99853515625, -1, -1, -1, 250.0);
-	CreateDynamicObject(1599, -1765.8565673828, 14.016443252563, 1068.2393798828, 19.9951171875, 0, 275.99853515625, -1, -1, -1, 250.0);
-	CreateDynamicObject(1599, -1762.7813720703, 13.998498916626, 1068.2393798828, 19.9951171875, 0, 275.99853515625, -1, -1, -1, 250.0);
-	CreateDynamicObject(1599, -1763.6053466797, 14.252637863159, 1068.2393798828, 19.9951171875, 0, 275.99853515625, -1, -1, -1, 250.0);
-	CreateDynamicObject(1599, -1767.4312744141, 13.923261642456, 1068.2393798828, 19.9951171875, 0, 275.99853515625, -1, -1, -1, 250.0);
-	CreateDynamicObject(1602, -1762.1346435547, 14.202372550964, 1068.3752441406, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(902, -1765.4271240234, 14.68643951416, 1066.7482910156, 0, 0, 306, -1, -1, -1, 250.0);
-	CreateDynamicObject(650, -1771.841796875, 14.009765625, 1066.7482910156, 0, 0, 263.99047851563, -1, -1, -1, 250.0);
-	CreateDynamicObject(3440, -1773.0825195313, 13.73023891449, 1068.7482910156, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3440, -1773.0498046875, 14.212493896484, 1068.7482910156, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3440, -1773.2216796875, 3.158203125, 1069.1274414063, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3858, -1765.83203125, 13.0185546875, 1067.7482910156, 0, 0, 223.99475097656, -1, -1, -1, 250.0);
-	CreateDynamicObject(10444, -1765.9327392578, 14.211910247803, 1056.2401123047, 90, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3439, -1767.2347412109, 14.542996406555, 1064.5228271484, 0, 0, 101.9970703125, -1, -1, -1, 250.0);
-	CreateDynamicObject(1572, -1850.8531494141, 17.264501571655, 1060.9835205078, 0, 0, 1.9940185546875, -1, -1, -1, 250.0);
-	CreateDynamicObject(1572, -1850.8784179688, 19.0383644104, 1060.9835205078, 0, 0, 1.9940185546875, -1, -1, -1, 250.0);
-	CreateDynamicObject(2885, -1844.4632568359, 21.359565734863, 1067.1202392578, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2885, -1839.2687988281, 26.619472503662, 1067.1202392578, 0, 0, 267.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(3389, -1807.6397705078, 21.469715118408, 1060.4094238281, 0, 0, 89.994506835938, -1, -1, -1, 250.0);
-	CreateDynamicObject(3389, -1809.0653076172, 21.453641891479, 1060.4094238281, 0, 0, 89.994506835938, -1, -1, -1, 250.0);
-	CreateDynamicObject(1216, -1868.8536376953, 13.881712913513, 1061.1086425781, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1216, -1869.75390625, 13.924003601074, 1061.1086425781, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1216, -1870.7048339844, 13.968946456909, 1061.1086425781, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1883.9400634766, -2.0061218738556, 1061.0791015625, 0, 0, 359.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1889.0050048828, -6.9041342735291, 1061.0791015625, 0, 0, 269.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1888.8234863281, -0.32893300056458, 1061.0791015625, 0, 0, 89.989013671875, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1888.8441162109, 1.8966454267502, 1061.0791015625, 0, 0, 269.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1893.9685058594, -0.06957072019577, 1061.0791015625, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1834.3194580078, -4.6370568275452, 1061.0688476563, 0, 0, 89.989013671875, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1834.3298339844, -3.9113521575928, 1061.0688476563, 0, 0, 269.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1822.6848144531, -4.0541820526123, 1061.0688476563, 0, 0, 269.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1822.6560058594, -4.7785925865173, 1061.0688476563, 0, 0, 89.989013671875, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1811.3050537109, -4.7568664550781, 1061.0688476563, 0, 0, 89.989013671875, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1811.3160400391, -3.9819514751434, 1061.0688476563, 0, 0, 269.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1231, -1852.4038085938, -35.087543487549, 1062.8739013672, 0, 0, 170, -1, -1, -1, 250.0);
-	CreateDynamicObject(1231, -1795.4833984375, -34.9443359375, 1062.8739013672, 0, 0, 169.99145507813, -1, -1, -1, 250.0);
-	CreateDynamicObject(3935, -1888.9923095703, 0.75394773483276, 1062.0471191406, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2369, -1895.7315673828, -17.325862884521, 1068.2938232422, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(1235, -1887.8033447266, 0.78797036409378, 1060.9230957031, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(16780, -1827.3989257813, -5.6921076774597, 1083.3021240234, 0, 90, 267, -1, -1, -1, 250.0);
-	CreateDynamicObject(16780, -1832.6486816406, -5.6605262756348, 1082.4830322266, 0, 90, 266.99523925781, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1861.236328125, 9.1474609375, 1067.2801513672, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1861.2138671875, 14.2529296875, 1067.2801513672, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1860.630859375, 5.8662109375, 1067.2801513672, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1856.9541015625, 5.8798828125, 1067.2801513672, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1855.328125, 5.8798828125, 1067.2801513672, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1852.0546875, 6.40234375, 1067.2801513672, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1852.05078125, 10.067269325256, 1067.2801513672, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1852.0654296875, 13.7783203125, 1067.2801513672, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(1523, -1856.728515625, 14.23828125, 1067.1236572266, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(1523, -1856.748046875, 7.5380859375, 1067.1486816406, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(3095, -1856.6198730469, 10.45565700531, 1069.6105957031, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1856.77734375, 10.7255859375, 1067.2801513672, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1856.763671875, 12.251953125, 1067.2801513672, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1853.4072265625, 12.83203125, 1067.2801513672, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1853.015625, 16.626953125, 1067.2801513672, 0, 0, 269.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1853.0234375, 9.2265625, 1067.2801513672, 0, 0, 269.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1853.4599609375, 6.08984375, 1067.2801513672, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1853.0126953125, 12.9267578125, 1067.2801513672, 0, 0, 269.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1856.18359375, 7.3681640625, 1067.2801513672, 0, 0, 359.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(2528, -1853.4794921875, 13.453125, 1067.298828125, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2528, -1853.3060302734, 6.674768447876, 1067.2738037109, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2515, -1857.3681640625, 9.4853515625, 1068.4091796875, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2440, -1857.259765625, 8.6127157211304, 1067.2738037109, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2439, -1857.26171875, 9.59375, 1067.2487792969, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2439, -1857.2607421875, 10.59375, 1067.2487792969, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2440, -1857.23046875, 11.587890625, 1067.2487792969, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2515, -1857.322265625, 10.6337890625, 1068.4091796875, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2492, -1894.7641601563, -18.96541595459, 1067.9022216797, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2498, -1899.2263183594, -16.91290473938, 1070.4449462891, 0, 0, 300, -1, -1, -1, 250.0);
-	CreateDynamicObject(2498, -1899.2506103516, -14.059661865234, 1070.4449462891, 0, 0, 299.99816894531, -1, -1, -1, 250.0);
-	CreateDynamicObject(2499, -1899.1461181641, -15.590866088867, 1071.9794921875, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2511, -1888.4487304688, -14.282510757446, 1068.7154541016, 0, 0, 249.99938964844, -1, -1, -1, 250.0);
-	CreateDynamicObject(2796, -1861.142578125, 7.787109375, 1068.6712646484, 0, 0, 90.24169921875, -1, -1, -1, 250.0);
-	//CreateDynamicObject(2395, -1857.2412109375, 6.119140625, 1067.2801513672, 0, 0, 179.99450683594, -1, -1, -1, 250.0); --bosscr4sh
-	CreateDynamicObject(2395, -1861.01953125, 6.408203125, 1067.2801513672, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1857.8662109375, 6.111328125, 1067.2801513672, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1860.9970703125, 11.5107421875, 1067.2801513672, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2796, -1861.1083984375, 12.5126953125, 1068.6462402344, 0, 0, 269.49462890625, -1, -1, -1, 250.0);
-	CreateDynamicObject(2742, -1859.921875, 6.25, 1068.6022949219, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2742, -1858.5947265625, 6.193359375, 1068.6022949219, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1860.5703125, 14.048828125, 1067.2801513672, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1856.869140625, 14.056640625, 1067.2801513672, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2395, -1856.2177734375, 14.0498046875, 1067.2801513672, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2741, -1856.833984375, 7.841796875, 1068.4890136719, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2741, -1856.8115234375, 12.3916015625, 1068.5140380859, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2718, -1760.3098144531, -5.8707761764526, 1070.6594238281, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2852, -1770.9552001953, -10.194198608398, 1067.8972167969, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2848, -1776.3355712891, -10.250263214111, 1067.8972167969, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2849, -1776.6623535156, -0.69120442867279, 1067.8972167969, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2829, -1769.7550048828, 11.426117897034, 1068.1130371094, 0, 0, 99.99755859375, -1, -1, -1, 250.0);
-	CreateDynamicObject(2842, -1861.0777587891, 9.7542419433594, 1067.2818603516, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2842, -1856.6622314453, 12.756469726563, 1066.7482910156, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2842, -1856.6959228516, 6.4000353813171, 1066.7482910156, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2251, -1857.2373046875, 11.44921875, 1069.0421142578, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2251, -1857.3486328125, 8.6513671875, 1069.0921630859, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2685, -1856.7607421875, 10.0439453125, 1068.9194335938, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2456, -1768.4599609375, 2.345703125, 1067.2738037109, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2475, -1899.603515625, -15.5732421875, 1067.1987304688, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2475, -1899.6044921875, -17.048828125, 1067.1987304688, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2479, -1899.3979492188, -16.669204711914, 1068.1446533203, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2479, -1899.4197998047, -15.427906036377, 1068.1196289063, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2464, -1890.4056396484, -14.326002120972, 1068.4271240234, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2466, -1899.4213867188, -15.942332267761, 1068.8580322266, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(3761, -1879.9833984375, -19.8984375, 1069.2827148438, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(3761, -1873.83203125, -19.9111328125, 1069.2827148438, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2465, -1887.6760253906, -17.871356964111, 1068.5291748047, 0, 0, 129.99572753906, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1893.9533691406, 2.630735874176, 1061.0791015625, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1893.9545898438, 5.3309097290039, 1061.0791015625, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(2885, -1807.3920898438, 26.741167068481, 1067.1202392578, 0, 0, 269.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(18092, -1889.0537109375, -14.3857421875, 1067.7836914063, 0, 0, 359.98352050781, -1, -1, -1, 250.0);
-	CreateDynamicObject(2361, -1761.1955566406, 1.6491981744766, 1067.2237548828, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(3440, -1773.0964355469, 13.24863243103, 1068.7482910156, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1837.0382080078, 12.636053085327, 1060.9266357422, 0, 0, 180, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1835.6982421875, 11.684759140015, 1060.9266357422, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(3858, -1884.1829833984, -14.605865478516, 1064.2393798828, 0, 0, 134.74475097656, -1, -1, -1, 250.0);
-	CreateDynamicObject(3858, -1884.1826171875, -14.60546875, 1064.2393798828, 0, 0, 134.74182128906, -1, -1, -1, 250.0);
-	CreateDynamicObject(3858, -1892.0433349609, -6.6995887756348, 1064.2393798828, 0, 0, 224.74182128906, -1, -1, -1, 250.0);
-	CreateDynamicObject(3858, -1892.04296875, -6.69921875, 1064.2393798828, 0, 0, 224.736328125, -1, -1, -1, 250.0);
-	CreateDynamicObject(1235, -1890.1053466797, 0.75075674057007, 1060.9230957031, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1883.1302490234, -1.9763971567154, 1061.0791015625, 0, 0, 179.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1883.2401123047, 3.956563949585, 1061.0791015625, 0, 0, 179.98901367188, -1, -1, -1, 250.0);
-	CreateDynamicObject(1256, -1884.0147705078, 3.9654855728149, 1061.0791015625, 0, 0, 359.98352050781, -1, -1, -1, 250.0);
-	CreateDynamicObject(1714, -1891.3907470703, -8.9358806610107, 1060.4211425781, 0, 0, 180, -1, -1, -1, 250.0);
-	CreateDynamicObject(1714, -1887.8153076172, -8.887716293335, 1060.4211425781, 0, 0, 179.99450683594, -1, -1, -1, 250.0);
-	CreateDynamicObject(1714, -1886.2640380859, -12.282489776611, 1060.4211425781, 0, 0, 49.994506835938, -1, -1, -1, 250.0);
-	CreateDynamicObject(1714, -1886.3663330078, -18.171674728394, 1060.4211425781, 0, 0, 89.994506835938, -1, -1, -1, 250.0);
-	CreateDynamicObject(2190, -1884.4637451172, -12.512238502502, 1061.7530517578, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2190, -1884.4946289063, -18.516830444336, 1061.7530517578, 0, 0, 270, -1, -1, -1, 250.0);
-	CreateDynamicObject(2190, -1887.6204833984, -7.0205903053284, 1061.7530517578, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2190, -1890.9213867188, -7.0612058639526, 1061.7530517578, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2186, -1893.8760986328, -13.171132087708, 1060.4212646484, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(2201, -1884.4401855469, -8.1255531311035, 1061.7530517578, 0, 0, 0, -1, -1, -1, 250.0);
-	CreateDynamicObject(2816, -1884.8566894531, -13.600368499756, 1061.7530517578, 0, 0, 300, -1, -1, -1, 250.0);
-	CreateDynamicObject(2773, -1837.962890625, 14.1162109375, 1060.9266357422, 0, 0, 90, -1, -1, -1, 250.0);
-	CreateDynamicObject(1533, -1789.85546875, 37.8193359375, 1060.4094238281, 0, 0, 270, -1, -1, -1, 250.0);
-
 	// Wang Cars
 	SetDynamicObjectMaterial( CreateDynamicObject( 18070, -1954.503173, 302.190399, 34.948787, 0.000000, 0.000000, -90.000000 ), 0, 8534, "tikimotel", "sa_wood01_128", 0 );
 	CreateDynamicObject( 2190, -1956.534423, 300.809387, 35.378757, 0.000000, 0.000000, 90.000000 );
diff --git a/pawno/include/irresistible/features/visage/blackjack.inc b/pawno/include/irresistible/features/visage/blackjack.inc
index d4bc86f..cf5fa4c 100644
--- a/pawno/include/irresistible/features/visage/blackjack.inc
+++ b/pawno/include/irresistible/features/visage/blackjack.inc
@@ -279,7 +279,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
 					szBigString = "~y~~k~~PED_SPRINT~~w~ - Begin game/Stand~n~~y~~k~~GROUP_CONTROL_BWD~~w~ - Hit~n~~y~~k~~VEHICLE_ENTER_EXIT~~w~ - Exit";
 					ShowPlayerHelpDialog( playerid, 0, szBigString );
 
-	                SendServerMessage( playerid, "You have entered the %s hand blackjack table.", ConvertPrice( g_blackjackData[ id ] [ E_PAYOUT ] ) );
+	                SendServerMessage( playerid, "You have entered the %s hand blackjack table.", number_format( g_blackjackData[ id ] [ E_PAYOUT ] ) );
 	                ApplyAnimation( playerid, "DEALER", "DEALER_IDLE", 4.1, 1, 1, 1, 1, 0, 1 );
 	                return 1;
 	            }
@@ -314,7 +314,7 @@ stock CreateBlackjackTable( payout, Float: X, Float: Y, Float: Z, Float: Angle,
         g_blackjackData[ id ] [ E_PAYOUT ] = payout;
         g_blackjackData[ id ] [ E_OBJECT ] = CreateDynamicObject( 2188, X, Y, Z, 0.00000, 0.00000, Angle, .worldid = world, .priority = 9999 );
         g_blackjackData[ id ] [ E_ACTOR ] = CreateDynamicActor( 171, X - 0.4 * floatcos( Angle - 90.0, degrees ), Y - 0.4 * floatsin( Angle - 90.0, degrees ), Z, Angle + 180.0, .worldid = world );
-        CreateDynamic3DTextLabel( sprintf( "Press ENTER To Play Blackjack\n"COL_WHITE"%s Minimum", ConvertPrice( payout ) ), COLOR_GREY, X, Y, Z + 0.25, 15.0, .testlos = 0, .worldid = world );
+        CreateDynamic3DTextLabel( sprintf( "Press ENTER To Play Blackjack\n"COL_WHITE"%s Minimum", number_format( payout ) ), COLOR_GREY, X, Y, Z + 0.25, 15.0, .testlos = 0, .worldid = world );
 
 		SetDynamicActorInvulnerable( g_blackjackData[ id ] [ E_ACTOR ], true );
 		SetDynamicActorVirtualWorld( g_blackjackData[ id ] [ E_ACTOR ], world );
@@ -569,8 +569,8 @@ stock CheckForBlackjack( tableid )
        		if ( dealer_score == player_score && dealer_score >= 17 ) {
        			payout = g_blackjackData[ tableid ] [ E_PAYOUT ];
                 g_blackjackPlayerState[ tableid ] [ player_index ] = BLACKJACK_STATE_WIN;
-                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has been returned %s due to a push.", ReturnPlayerName( playerid ), playerid, ConvertPrice( payout ) );
-		 		GameTextForPlayer( playerid, sprintf( "~n~~n~~g~%s won!", ConvertPrice( payout ) ), 4000, 3 );
+                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has been returned %s due to a push.", ReturnPlayerName( playerid ), playerid, number_format( payout ) );
+		 		GameTextForPlayer( playerid, sprintf( "~n~~n~~g~%s won!", number_format( payout ) ), 4000, 3 );
                 GivePlayerCasinoRewardsPoints( playerid, g_blackjackData[ tableid ] [ E_PAYOUT ], .house_edge = 1.5 );
                 GivePlayerCash( playerid, payout );
             }
@@ -578,43 +578,43 @@ stock CheckForBlackjack( tableid )
                 g_blackjackPlayerState[ tableid ] [ player_index ] = BLACKJACK_STATE_WIN;
                 if ( IsPlayerHandBlackjack( tableid, player_index, player_score ) ) {
 	                payout = floatround( float( g_blackjackData[ tableid ] [ E_PAYOUT ] ) * 2.5 );
-	                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" Blackjack! %s(%d) has won %s!", ReturnPlayerName( playerid ), playerid, ConvertPrice( payout ) );
+	                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" Blackjack! %s(%d) has won %s!", ReturnPlayerName( playerid ), playerid, number_format( payout ) );
                 } else {
-	                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has won %s due to a card count of 21!", ReturnPlayerName( playerid ), playerid, ConvertPrice( payout ) );
+	                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has won %s due to a card count of 21!", ReturnPlayerName( playerid ), playerid, number_format( payout ) );
                 }
-		 		GameTextForPlayer( playerid, sprintf( "~n~~n~~g~%s won!", ConvertPrice( payout ) ), 4000, 3 );
+		 		GameTextForPlayer( playerid, sprintf( "~n~~n~~g~%s won!", number_format( payout ) ), 4000, 3 );
                 GivePlayerCasinoRewardsPoints( playerid, g_blackjackData[ tableid ] [ E_PAYOUT ], .house_edge = 1.5 );
                 GivePlayerCash( playerid, payout );
             }
             else if ( dealer_score == 21 ) {
                 GivePlayerCasinoRewardsPoints( playerid, g_blackjackData[ tableid ] [ E_PAYOUT ], .house_edge = 1.5 );
                 g_blackjackPlayerState[ tableid ] [ player_index ] = BLACKJACK_STATE_BUST;
-                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has lost %s due to a dealer %s.", ReturnPlayerName( playerid ), playerid, ConvertPrice( g_blackjackData[ tableid ] [ E_PAYOUT ] ), IsDealerHandBlackjack( tableid, dealer_score ) ? ( "blackjack" ) : ( "21" ) );
+                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has lost %s due to a dealer %s.", ReturnPlayerName( playerid ), playerid, number_format( g_blackjackData[ tableid ] [ E_PAYOUT ] ), IsDealerHandBlackjack( tableid, dealer_score ) ? ( "blackjack" ) : ( "21" ) );
 		 		GameTextForPlayer( playerid, "~n~~n~~r~No win!", 4000, 3 );
             }
             else if ( player_score > 21 ) {
                 GivePlayerCasinoRewardsPoints( playerid, g_blackjackData[ tableid ] [ E_PAYOUT ], .house_edge = 1.5 );
                 g_blackjackPlayerState[ tableid ] [ player_index ] = BLACKJACK_STATE_BUST;
-                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has lost %s due to a bust.", ReturnPlayerName( playerid ), playerid, ConvertPrice( g_blackjackData[ tableid ] [ E_PAYOUT ] ) );
+                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has lost %s due to a bust.", ReturnPlayerName( playerid ), playerid, number_format( g_blackjackData[ tableid ] [ E_PAYOUT ] ) );
 		 		GameTextForPlayer( playerid, "~n~~n~~r~No win!", 4000, 3 );
             }
             else if ( dealer_score > 21 ) {
                 g_blackjackPlayerState[ tableid ] [ player_index ] = BLACKJACK_STATE_WIN;
-                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has won %s due to a dealer bust.", ReturnPlayerName( playerid ), playerid, ConvertPrice( payout ) );
-		 		GameTextForPlayer( playerid, sprintf( "~n~~n~~g~%s won!", ConvertPrice( payout ) ), 4000, 3 );
+                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has won %s due to a dealer bust.", ReturnPlayerName( playerid ), playerid, number_format( payout ) );
+		 		GameTextForPlayer( playerid, sprintf( "~n~~n~~g~%s won!", number_format( payout ) ), 4000, 3 );
                 GivePlayerCasinoRewardsPoints( playerid, g_blackjackData[ tableid ] [ E_PAYOUT ], .house_edge = 1.5 );
                 GivePlayerCash( playerid, payout );
             }
             else if ( player_score < dealer_score && dealer_score >= 17 ) {
                 GivePlayerCasinoRewardsPoints( playerid, g_blackjackData[ tableid ] [ E_PAYOUT ], .house_edge = 1.5 );
                 g_blackjackPlayerState[ tableid ] [ player_index ] = BLACKJACK_STATE_BUST;
-                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has lost %s due to a bust.", ReturnPlayerName( playerid ), playerid, ConvertPrice( g_blackjackData[ tableid ] [ E_PAYOUT ] ) );
+                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has lost %s due to a bust.", ReturnPlayerName( playerid ), playerid, number_format( g_blackjackData[ tableid ] [ E_PAYOUT ] ) );
 		 		GameTextForPlayer( playerid, "~n~~n~~r~No win!", 4000, 3 );
             }
             else if ( player_score > dealer_score && dealer_score >= 17 ) {
                 g_blackjackPlayerState[ tableid ] [ player_index ] = BLACKJACK_STATE_WIN;
-                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has won %s due to a dealer bust.", ReturnPlayerName( playerid ), playerid, ConvertPrice( g_blackjackData[ tableid ] [ E_PAYOUT ] ) );
-		 		GameTextForPlayer( playerid, sprintf( "~n~~n~~g~%s won!", ConvertPrice( payout ) ), 4000, 3 );
+                SendClientMessageToBlackjack( tableid, COLOR_GREY, "[BLACKJACK]"COL_WHITE" %s(%d) has won %s due to a dealer bust.", ReturnPlayerName( playerid ), playerid, number_format( g_blackjackData[ tableid ] [ E_PAYOUT ] ) );
+		 		GameTextForPlayer( playerid, sprintf( "~n~~n~~g~%s won!", number_format( payout ) ), 4000, 3 );
                 GivePlayerCasinoRewardsPoints( playerid, g_blackjackData[ tableid ] [ E_PAYOUT ], .house_edge = 1.5 );
                 GivePlayerCash( playerid, payout );
             }
@@ -622,7 +622,7 @@ stock CheckForBlackjack( tableid )
             // alert world
 			if ( g_blackjackPlayerState[ tableid ] [ player_index ] == BLACKJACK_STATE_WIN && payout > g_blackjackData[ tableid ] [ E_PAYOUT ] && payout >= 10000 ) {
 				UpdateServerVariable( "blackjack_wins", 0, GetGVarFloat( "blackjack_wins" ) + ( float( payout ) / 1000000.0 ), "", GLOBAL_VARTYPE_FLOAT );
-				SendGlobalMessage( -1, ""COL_GREY"[CASINO]{FFFFFF} %s(%d) has won "COL_GOLD"%s"COL_WHITE" from blackjack!", ReturnPlayerName( playerid ), playerid, ConvertPrice( payout ) );
+				SendGlobalMessage( -1, ""COL_GREY"[CASINO]{FFFFFF} %s(%d) has won "COL_GOLD"%s"COL_WHITE" from blackjack!", ReturnPlayerName( playerid ), playerid, number_format( payout ) );
 			}
         }
     }
diff --git a/pawno/include/irresistible/features/visage/fireworks.inc b/pawno/include/irresistible/features/visage/fireworks.inc
index 4719f40..8e94bc4 100644
--- a/pawno/include/irresistible/features/visage/fireworks.inc
+++ b/pawno/include/irresistible/features/visage/fireworks.inc
@@ -80,6 +80,7 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
 {
 	if (dialogid == DIALOG_FIREWORKS)
 	{
+		if ( GetPlayerFireworks( playerid ) < 1 ) return SendError( playerid, "You do not have any fireworks." );
 		switch ( listitem )
 		{
 			case 0:
@@ -117,6 +118,8 @@ hook OnDialogResponse( playerid, dialogid, response, listitem, inputtext[ ] )
 	}
 	else if ( dialogid == DIALOG_FIREWORKS_COLOR )
 	{
+		if ( GetPlayerFireworks( playerid ) < 1 ) return SendError( playerid, "You do not have any fireworks." );
+
 		if ( ! response )
 		{
 			DeletePVar(playerid, "FW_Color1");
@@ -511,46 +514,24 @@ public FW_MainCreateEnd(playerid, firework)
 		GetXYInFrontOfPlayer(playerid, fwX, fwY, Z, 1.0);
 		new Float: R = atan2( fwY - plY, fwX - fwX ) - 90.0; // GetAngleToPos(plX, plY, fwX, fwY);
 
-		switch(firework)
+		switch( firework )
 		{
-			case FW_UNKNOWN: return SendError( playerid, "Fireworks couldn't be created!" ), 0;
-			case FW_FOUNTAIN:
-			{
-				FW_FountainCreate(playerid, fw, fwX, fwY, Z, R, GetPVarInt(playerid, "FW_Color1"), GetPVarInt(playerid, "FW_Color2"));
-				DeletePVar(playerid, "FW_Color1");
-				DeletePVar(playerid, "FW_Color2");
-				return 1;
-			}
-			case FW_ROCKET:
-			{
-				FW_RocketCreate(playerid, fw, fwX, fwY, Z, R, GetPVarInt(playerid, "FW_Color1"), GetPVarInt(playerid, "FW_Color2"));
-				DeletePVar(playerid, "FW_Color1");
-				DeletePVar(playerid, "FW_Color2");
-				return 1;
-			}
-			case FW_SPLITTER:
-			{
-				FW_SplitterCreate(playerid, fw, fwX, fwY, Z, R, GetPVarInt(playerid, "FW_Color1"), GetPVarInt(playerid, "FW_Color2"));
-				DeletePVar(playerid, "FW_Color1");
-				DeletePVar(playerid, "FW_Color2");
-				return 1;
-			}
-			case FW_UMBRELLA:
-			{
-				FW_UmbrelllaCreate(playerid, fw, fwX, fwY, Z, R, GetPVarInt(playerid, "FW_Color1"), GetPVarInt(playerid, "FW_Color2"));
-				DeletePVar(playerid, "FW_Color1");
-				DeletePVar(playerid, "FW_Color2");
-				return 1;
-			}
-			case FW_CAKE:
-			{
-				FW_CakeCreate(playerid, fw, fwX, fwY, Z, R, GetPVarInt(playerid, "FW_Color1"), GetPVarInt(playerid, "FW_Color2"));
-				DeletePVar(playerid, "FW_Color1");
-				DeletePVar(playerid, "FW_Color2");
-				return 1;
-			}
+			case FW_FOUNTAIN: FW_FountainCreate(playerid, fw, fwX, fwY, Z, R, GetPVarInt(playerid, "FW_Color1"), GetPVarInt(playerid, "FW_Color2"));
+			case FW_ROCKET: FW_RocketCreate(playerid, fw, fwX, fwY, Z, R, GetPVarInt(playerid, "FW_Color1"), GetPVarInt(playerid, "FW_Color2"));
+			case FW_SPLITTER: FW_SplitterCreate(playerid, fw, fwX, fwY, Z, R, GetPVarInt(playerid, "FW_Color1"), GetPVarInt(playerid, "FW_Color2"));
+			case FW_UMBRELLA: FW_UmbrelllaCreate(playerid, fw, fwX, fwY, Z, R, GetPVarInt(playerid, "FW_Color1"), GetPVarInt(playerid, "FW_Color2"));
+			case FW_CAKE: FW_CakeCreate(playerid, fw, fwX, fwY, Z, R, GetPVarInt(playerid, "FW_Color1"), GetPVarInt(playerid, "FW_Color2"));
 			default: return SendError( playerid, "Fireworks couldn't be created!" );
 		}
+
+		// reset colors
+		DeletePVar(playerid, "FW_Color1");
+		DeletePVar(playerid, "FW_Color2");
+
+		// give a less firework
+		GivePlayerFireworks( playerid, -1 );
+		SendServerMessage( playerid, "You have placed a firework. You now have %d remaining fireworks.", GetPlayerFireworks( playerid ) );
+		return 1;
 	}
 	return SendError( playerid, "Server limit is reached! Light some before you place more." ), 0;
 }
@@ -1144,7 +1125,7 @@ stock RemoveWeaponFromSlot(playerid, weaponslot)
 /* ** Commands ** */
 CMD:fireworks( playerid, params[] )
 {
-	if ( ! IsPlayerAdmin( playerid ) ) return 0;
+	if ( GetPlayerFireworks( playerid ) < 1 ) return SendError( playerid, "You do not have any fireworks." );
 	ShowPlayerDialog( playerid, DIALOG_FIREWORKS, DIALOG_STYLE_LIST, ""COL_WHITE"Fireworks", "Fountain\nRocket\nSplitter\nUmbrella\nCake", "Select", "Back" );
 	return 1;
 }
diff --git a/pawno/include/irresistible/features/visage/poker.inc b/pawno/include/irresistible/features/visage/poker.inc
index d6a7bb1..d757f40 100644
--- a/pawno/include/irresistible/features/visage/poker.inc
+++ b/pawno/include/irresistible/features/visage/poker.inc
@@ -413,7 +413,7 @@ stock ResetLabel(handle)
 	new const buy_in = TableData[handle][E_TABLE_BUY_IN];
 	new const small_blind = TableData[handle][E_TABLE_SMALL_BLIND];
 	UpdateDynamic3DTextLabelTextEx(TableData[handle][E_TABLE_POT_LABEL], COLOR_GREY,
-		"Press ENTER To Play Poker\n{FFFFFF}%s Minimum\n%s / %s Blinds", ConvertPrice(buy_in), ConvertPrice(small_blind), ConvertPrice(small_blind * 2));
+		"Press ENTER To Play Poker\n{FFFFFF}%s Minimum\n%s / %s Blinds", number_format(buy_in), number_format(small_blind), number_format(small_blind * 2));
 	return 1;
 }
 
@@ -1029,7 +1029,7 @@ stock AddPlayerToTable(playerid, handle)
 		return 0;
 	}
 
-	if(GetPlayerCash(playerid) < TableData[handle][E_TABLE_BUY_IN]) return SendPokerMessage(playerid, "You don't have enough money to access this table. Buy In: %s", ConvertPrice(TableData[handle][E_TABLE_BUY_IN]));
+	if(GetPlayerCash(playerid) < TableData[handle][E_TABLE_BUY_IN]) return SendPokerMessage(playerid, "You don't have enough money to access this table. Buy In: %s", number_format(TableData[handle][E_TABLE_BUY_IN]));
 
 	new index = Player_GetUnusedAttachIndex(playerid);
 	if(index == cellmin)
@@ -1073,7 +1073,7 @@ stock AddPlayerToTable(playerid, handle)
 	TableData[handle][E_TABLE_CHAIR_PLAYER_ID][slot] = playerid;
 	GivePlayerCash(playerid, -TableData[handle][E_TABLE_BUY_IN]);
 	PlayerData[playerid][E_PLAYER_TOTAL_CHIPS] = TableData[handle][E_TABLE_BUY_IN];
-	SendPokerMessage(playerid, "You've been charged %s as a result of joining in the table.", ConvertPrice(TableData[handle][E_TABLE_BUY_IN]));
+	SendPokerMessage(playerid, "You've been charged %s as a result of joining in the table.", number_format(TableData[handle][E_TABLE_BUY_IN]));
 	//Allow players to join a table where a game has already started but there are empty seats remaining (these players will be able to play once the current match finishes)
 	if(TableData[handle][E_TABLE_CURRENT_STATE] != STATE_BEGIN)
 	{
@@ -1135,13 +1135,13 @@ stock UpdateInfoTextdrawsForPlayer(playerid)
 {
 	new handle = PlayerData[playerid][E_PLAYER_CURRENT_HANDLE];
 	new tstring[64];
-	format(tstring, sizeof(tstring), "~g~Chips:_~w~%s", ConvertPrice(PlayerData[playerid][E_PLAYER_TOTAL_CHIPS]));
+	format(tstring, sizeof(tstring), "~g~Chips:_~w~%s", number_format(PlayerData[playerid][E_PLAYER_TOTAL_CHIPS]));
 	PlayerTextDrawSetString(playerid, PlayerData[playerid][E_PLAYER_INFO_TXT][2], tstring);
-	format(tstring, sizeof(tstring), "~y~Pot:_~w~%s", ConvertPrice(TableData[handle][E_TABLE_POT_CHIPS][MAIN_POT]));
+	format(tstring, sizeof(tstring), "~y~Pot:_~w~%s", number_format(TableData[handle][E_TABLE_POT_CHIPS][MAIN_POT]));
 	PlayerTextDrawSetString(playerid, PlayerData[playerid][E_PLAYER_INFO_TXT][3], tstring);
-	format(tstring, sizeof(tstring), "~r~Last_bet:_~w~%s", ConvertPrice(TableData[handle][E_TABLE_LAST_BET]));
+	format(tstring, sizeof(tstring), "~r~Last_bet:_~w~%s", number_format(TableData[handle][E_TABLE_LAST_BET]));
 	PlayerTextDrawSetString(playerid, PlayerData[playerid][E_PLAYER_INFO_TXT][4], tstring);
-	format(tstring, sizeof(tstring), "~r~Your_bet:_~w~%s", ConvertPrice(PlayerData[playerid][E_PLAYER_CURRENT_BET]));
+	format(tstring, sizeof(tstring), "~r~Your_bet:_~w~%s", number_format(PlayerData[playerid][E_PLAYER_CURRENT_BET]));
 	PlayerTextDrawSetString(playerid, PlayerData[playerid][E_PLAYER_INFO_TXT][5], tstring);
 	return 1;
 }
@@ -1566,8 +1566,8 @@ public Poker_DealCards(handle)
 	{
 		PlayerData[big_blind][E_PLAYER_CURRENT_BET] = TableData[handle][E_TABLE_BIG_BLIND];
 		PlayerData[small_blind][E_PLAYER_CURRENT_BET] = TableData[handle][E_TABLE_SMALL_BLIND];
-		SendTableMessage(handle, "{2DD9A9} * * %s posts a small blind of %s.. * *", ReturnPlayerName(TableData[handle][E_TABLE_PLAYER_SMALL_BLIND_ID]), ConvertPrice(TableData[handle][E_TABLE_SMALL_BLIND]));
-		SendTableMessage(handle, "{2DD9A9}  * * %s posts a big blind of %s.. * *", ReturnPlayerName(TableData[handle][E_TABLE_PLAYER_BIG_BLIND_ID]), ConvertPrice(TableData[handle][E_TABLE_BIG_BLIND]));
+		SendTableMessage(handle, "{2DD9A9} * * %s posts a small blind of %s.. * *", ReturnPlayerName(TableData[handle][E_TABLE_PLAYER_SMALL_BLIND_ID]), number_format(TableData[handle][E_TABLE_SMALL_BLIND]));
+		SendTableMessage(handle, "{2DD9A9}  * * %s posts a big blind of %s.. * *", ReturnPlayerName(TableData[handle][E_TABLE_PLAYER_BIG_BLIND_ID]), number_format(TableData[handle][E_TABLE_BIG_BLIND]));
 		new next_turn = GetTurnAfterPlayer(handle, TableData[handle][E_TABLE_PLAYER_BIG_BLIND_ID]);
 		TableData[handle][E_TABLE_LAST_BET] = TableData[handle][E_TABLE_BIG_BLIND];
 		SetLastToRaise(handle, next_turn);
@@ -1590,7 +1590,7 @@ public Poker_DealCards(handle)
 		}
 		else
 		{
-			SendTableMessage(handle, "{2DD9A9} * * %s posts a small blind of %s.. * *", ReturnPlayerName(TableData[handle][E_TABLE_PLAYER_SMALL_BLIND_ID]), ConvertPrice(TableData[handle][E_TABLE_SMALL_BLIND]));
+			SendTableMessage(handle, "{2DD9A9} * * %s posts a small blind of %s.. * *", ReturnPlayerName(TableData[handle][E_TABLE_PLAYER_SMALL_BLIND_ID]), number_format(TableData[handle][E_TABLE_SMALL_BLIND]));
 			RemoveChipsFromPlayer( small_blind, TableData[handle][E_TABLE_SMALL_BLIND]);
 			PlayerData[small_blind][E_PLAYER_CURRENT_BET] = TableData[handle][E_TABLE_SMALL_BLIND];
 		}
@@ -1609,7 +1609,7 @@ public Poker_DealCards(handle)
 		else
 		{
 
-			SendTableMessage(handle, "{2DD9A9}  * * %s posts a big blind of %s.. * *", ReturnPlayerName(TableData[handle][E_TABLE_PLAYER_BIG_BLIND_ID]), ConvertPrice(TableData[handle][E_TABLE_BIG_BLIND]));
+			SendTableMessage(handle, "{2DD9A9}  * * %s posts a big blind of %s.. * *", ReturnPlayerName(TableData[handle][E_TABLE_PLAYER_BIG_BLIND_ID]), number_format(TableData[handle][E_TABLE_BIG_BLIND]));
 			RemoveChipsFromPlayer( big_blind, TableData[handle][E_TABLE_BIG_BLIND]);
 			PlayerData[big_blind][E_PLAYER_CURRENT_BET] = TableData[handle][E_TABLE_BIG_BLIND];
 			TableData[handle][E_TABLE_LAST_BET] = TableData[handle][E_TABLE_BIG_BLIND];
@@ -1639,14 +1639,14 @@ static stock UpdateTable(handle)
 		UpdateInfoTextdrawsForPlayer(playerid);
 		new const seat = PlayerData[playerid][E_PLAYER_CURRENT_CHAIR_SLOT];
 		new str[128	];
-		format(str, sizeof(str), "{34c5db}Chips: {db8d34}%s\n{db3a34}Last bet: {db8d34}%s", ConvertPrice(PlayerData[playerid][E_PLAYER_TOTAL_CHIPS]), ConvertPrice(PlayerData[playerid][E_PLAYER_CURRENT_BET]));
+		format(str, sizeof(str), "{34c5db}Chips: {db8d34}%s\n{db3a34}Last bet: {db8d34}%s", number_format(PlayerData[playerid][E_PLAYER_TOTAL_CHIPS]), number_format(PlayerData[playerid][E_PLAYER_CURRENT_BET]));
 		UpdateDynamic3DTextLabelText(TableData[handle][E_TABLE_BET_LABELS][seat], T_BET_LABEL_COLOR, str);
 		SetChipsValue(handle, PlayerData[playerid][E_PLAYER_CURRENT_CHAIR_SLOT], PlayerData[playerid][E_PLAYER_TOTAL_CHIPS]);
 
 	}
 	new str[256];
 	new tmp[10];
-	format(str, sizeof(str), "{59cdff}Main Pot: {ff9059}%s\n", ConvertPrice(TableData[handle][E_TABLE_POT_CHIPS][MAIN_POT]));
+	format(str, sizeof(str), "{59cdff}Main Pot: {ff9059}%s\n", number_format(TableData[handle][E_TABLE_POT_CHIPS][MAIN_POT]));
 	SetPotChipsValue(handle, TableData[handle][E_TABLE_POT_CHIPS][MAIN_POT]);
 	if(Iter_Count(IT_Sidepots[handle] > 1))
 	{
@@ -1654,7 +1654,7 @@ static stock UpdateTable(handle)
 		foreach(new i: IT_Sidepots[handle])
 		{
 			if(i == MAIN_POT) continue;
-			format(tmp, sizeof(tmp), "%s\n", ConvertPrice(TableData[handle][E_TABLE_POT_CHIPS][i]));
+			format(tmp, sizeof(tmp), "%s\n", number_format(TableData[handle][E_TABLE_POT_CHIPS][i]));
 			strcat(str, tmp);
 		}
 	}
@@ -1982,7 +1982,7 @@ stock CheckShowdown(handle)
 			GivePlayerCasinoRewardsPoints(high_id, fee_earned, .house_edge = 100.0);
 			SendTableMessage(handle, "{9FCF30}****************************************************************************************");
 			SendTableMessage(handle, "{9FCF30}Player {FF8000}%s {9FCF30}has won with a {377CC8}%s", ReturnPlayerName(high_id), HAND_RANKS[highest_rank >> 12]);
-			SendTableMessage(handle, "{9FCF30}Prize: {377CC8}%s | -%0.0f%s percent fee.", ConvertPrice(w_chips), T_POT_FEE_RATE * 100.0, "%%");
+			SendTableMessage(handle, "{9FCF30}Prize: {377CC8}%s | -%0.0f%s percent fee.", number_format(w_chips), T_POT_FEE_RATE * 100.0, "%%");
 			SendTableMessage(handle, "{9FCF30}****************************************************************************************");
 			if (strmatch(HAND_RANKS[highest_rank >> 12], "Royal Flush")) printf("****\nRoyal Flush Player %s\n****\n", ReturnPlayerName(high_id));
 			PlayerData[high_id][E_PLAYER_TOTAL_CHIPS] += w_chips;
@@ -2198,7 +2198,7 @@ stock bool: FoldPlayer(handle, playerid)
 		new fee_earned = floatround((float(TableData[handle][E_TABLE_POT_CHIPS][MAIN_POT]) / 1000.0) * T_POT_FEE_RATE);
 		UpdateServerVariable( "poker_fees", 0, GetGVarFloat( "poker_fees" ) + fee_earned, "", GLOBAL_VARTYPE_FLOAT );
 		GivePlayerCasinoRewardsPoints(winner, fee_earned, .house_edge = 100.0);
-		SendTableMessage(handle, "{9FCF30}Prize: {377CC8}%s | -%0.0f%s percent fee", ConvertPrice(w_chips), T_POT_FEE_RATE * 100.0, "%%");
+		SendTableMessage(handle, "{9FCF30}Prize: {377CC8}%s | -%0.0f%s percent fee", number_format(w_chips), T_POT_FEE_RATE * 100.0, "%%");
 		SendTableMessage(handle, "{9FCF30}****************************************************************************************");
 		PlayerData[winner][E_PLAYER_TOTAL_CHIPS]  += w_chips;
 		PlayerData[winner][E_PLAYER_TOTAL_CHIPS]  += PlayerData[winner][E_PLAYER_CURRENT_BET];
@@ -2255,8 +2255,8 @@ hook OnPlayerClickPlayerTD(playerid, PlayerText:playertextid)
 				if(PlayerData[playerid][E_PLAYER_TOTAL_CHIPS] >= dif)
 				{
 					KillPlayerTurnTimer(playerid);
-					SendTableMessage(handle, "{2DD9A9}  * * %s calls %s .. * *", ReturnPlayerName(playerid), ConvertPrice(dif));
-					SetPlayerChatBubbleEx(playerid, -1, 30.0, 2000, "{22B1BD}** CALLS %s ** ", ConvertPrice(dif));
+					SendTableMessage(handle, "{2DD9A9}  * * %s calls %s .. * *", ReturnPlayerName(playerid), number_format(dif));
+					SetPlayerChatBubbleEx(playerid, -1, 30.0, 2000, "{22B1BD}** CALLS %s ** ", number_format(dif));
 					RemoveChipsFromPlayer( playerid, dif);
 					PlayerData[playerid][E_PLAYER_CURRENT_BET] = TableData[handle][E_TABLE_LAST_BET];
 					SetPlayerClickedTxt(playerid, true);
@@ -2305,8 +2305,8 @@ stock ForcePlayerAllIn(playerid, handle, bool:checkpot = true)
 	Iter_Add(IT_PlayersAllIn<handle>, playerid);
 	new raise = PlayerData[playerid][E_PLAYER_TOTAL_CHIPS] + PlayerData[playerid][E_PLAYER_CURRENT_BET];
 	PlayerData[playerid][E_PLAYER_CURRENT_BET] = raise;
-	SendTableMessage(handle, "{2DD9A9}  * * %s goes all in with %s .. * *", ReturnPlayerName(playerid), ConvertPrice(raise));
-	SetPlayerChatBubbleEx(playerid, -1, 30.0, 2000, "{9512CD}** ALL IN with %s ** ", ConvertPrice(raise));
+	SendTableMessage(handle, "{2DD9A9}  * * %s goes all in with %s .. * *", ReturnPlayerName(playerid), number_format(raise));
+	SetPlayerChatBubbleEx(playerid, -1, 30.0, 2000, "{9512CD}** ALL IN with %s ** ", number_format(raise));
 	PlayerData[playerid][E_PLAYER_TOTAL_CHIPS] = 0;
 	if(checkpot)
 		CheckPotAndNextTurn(playerid, handle);
@@ -2328,7 +2328,7 @@ hook OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 		{
 			GivePlayerCash(playerid, -TableData[handle][E_TABLE_BUY_IN]);
 			PlayerData[playerid][E_PLAYER_TOTAL_CHIPS] = TableData[handle][E_TABLE_BUY_IN];
-			SendTableMessage(handle, ""COL_GREY"-- "COL_WHITE"Player %s has paid the buy-in fee of %s chips to keep playing.", ReturnPlayerName(playerid), ConvertPrice(TableData[handle][E_TABLE_BUY_IN]));
+			SendTableMessage(handle, ""COL_GREY"-- "COL_WHITE"Player %s has paid the buy-in fee of %s chips to keep playing.", ReturnPlayerName(playerid), number_format(TableData[handle][E_TABLE_BUY_IN]));
 		}
 		else
 		{
@@ -2373,7 +2373,7 @@ hook OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 			}
 			else if(raise <= TableData[handle][E_TABLE_LAST_BET])
 			{
-				SendPokerMessage(playerid, "Value must be greater than the last bet: %s", ConvertPrice(TableData[handle][E_TABLE_LAST_BET]));
+				SendPokerMessage(playerid, "Value must be greater than the last bet: %s", number_format(TableData[handle][E_TABLE_LAST_BET]));
 				ShowPlayerRaiseDialog(playerid);
 				return 1;
 			}
@@ -2382,8 +2382,8 @@ hook OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				ApplyAnimation(playerid, "INT_OFFICE", "OFF_Sit_Idle_Loop", 4.1, 1, 1, 1, 0, 0, 1);
 				KillPlayerTurnTimer(playerid);
 				//all in - not mandatory
-				SendTableMessage(handle, "{2DD9A9}  * * %s goes all in with %s .. * *", ReturnPlayerName(playerid), ConvertPrice(raise));
-				SetPlayerChatBubbleEx(playerid, -1, 30.0, 2000, "{9512CD}** ALL IN with %s ** ", ConvertPrice(raise));
+				SendTableMessage(handle, "{2DD9A9}  * * %s goes all in with %s .. * *", ReturnPlayerName(playerid), number_format(raise));
+				SetPlayerChatBubbleEx(playerid, -1, 30.0, 2000, "{9512CD}** ALL IN with %s ** ", number_format(raise));
 				Iter_Add(IT_PlayersAllIn<handle>, playerid);
 				RemoveChipsFromPlayer( playerid, raise);
 				SetLastToRaise(handle, playerid);
@@ -2402,13 +2402,13 @@ hook OnDialogResponse(playerid, dialogid, response, listitem, inputtext[])
 				RemoveChipsFromPlayer( playerid, dif);
 				if(PlayerData[playerid][E_PLAYER_RCHOICE] == E_RAISE_BET)
 				{
-					SendTableMessage(handle, "{2DD9A9}  * * %s  bets %s .. * *", ReturnPlayerName(playerid), ConvertPrice(raise));
-					SetPlayerChatBubbleEx(playerid, -1, 30.0, 2000, "{31CA15}** BETS %s ** ", ConvertPrice(raise));
+					SendTableMessage(handle, "{2DD9A9}  * * %s bets %s .. * *", ReturnPlayerName(playerid), number_format(raise));
+					SetPlayerChatBubbleEx(playerid, -1, 30.0, 2000, "{31CA15}** BETS %s ** ", number_format(raise));
 				}
 				else
 				{
-					SendTableMessage(handle, "{2DD9A9}  * * %s raises to %s .. * *", ReturnPlayerName(playerid), ConvertPrice(raise));
-					SetPlayerChatBubbleEx(playerid, -1, 30.0, 2000, "{31CA15}** RAISES to %s ** ", ConvertPrice(raise));
+					SendTableMessage(handle, "{2DD9A9}  * * %s raises to %s .. * *", ReturnPlayerName(playerid), number_format(raise));
+					SetPlayerChatBubbleEx(playerid, -1, 30.0, 2000, "{31CA15}** RAISES to %s ** ", number_format(raise));
 				}
 				CheckPotAndNextTurn(playerid, handle);
 			}
@@ -2561,24 +2561,24 @@ hook OnGameModeInit()
 	AddServerVariable( "poker_fees", "0.0", GLOBAL_VARTYPE_FLOAT );
 
 	// red dragons casino
-	CreatePokerTable( 25000000, 250000, 1968.395019, 1027.808959, 991.828002, 2, 23, 10 );
-	CreatePokerTable( 10000000, 100000, 1940.795043, 1008.741027, 991.828002, 2, 23, 10 );
-	CreatePokerTable( 5000000, 500000, 1940.795043, 1027.240966, 991.828002, 3, 23, 10 );
-	CreatePokerTable( 2500000, 25000, 1940.795043, 1021.075012, 991.828002, 4, 23, 10 );
-	CreatePokerTable( 1000000, 10000, 1940.795043, 1014.908996, 991.828002, 4, 23, 10 );
-	CreatePokerTable( 500000, 5000, 1968.395019, 1014.609008, 991.828002, 5, 23, 10 );
-	CreatePokerTable( 250000, 2500, 1968.395019, 1021.208984, 991.828002, 6, 23, 10 );
-	CreatePokerTable( 100000, 1000, 1968.395019, 1008.008972, 991.828002, 6, 23, 10 );
+	CreatePokerTable( 1000000, 250000, 1968.395019, 1027.808959, 991.828002, 2, 23, 10 );
+	CreatePokerTable( 500000, 100000, 1940.795043, 1008.741027, 991.828002, 3, 23, 10 );
+	CreatePokerTable( 250000, 500000, 1940.795043, 1027.240966, 991.828002, 3, 23, 10 );
+	CreatePokerTable( 100000, 25000, 1940.795043, 1021.075012, 991.828002, 4, 23, 10 );
+	CreatePokerTable( 50000, 10000, 1940.795043, 1014.908996, 991.828002, 4, 23, 10 );
+	CreatePokerTable( 25000, 5000, 1968.395019, 1014.609008, 991.828002, 5, 23, 10 );
+	CreatePokerTable( 10000, 2500, 1968.395019, 1021.208984, 991.828002, 6, 23, 10 );
+	CreatePokerTable( 5000, 1000, 1968.395019, 1008.008972, 991.828002, 6, 23, 10 );
 
 	// caliguas casino
-	CreatePokerTable( 2500000, 25000, 2273.936035, 1597.272949, 1005.568969, 2, 82, 1 );
-	CreatePokerTable( 1000000, 10000, 2252.936035, 1591.272949, 1005.568969, 2, 82, 1 );
-	CreatePokerTable( 500000, 5000, 2255.936035, 1597.272949, 1005.568969, 3, 82, 1 );
-	CreatePokerTable( 250000, 2500, 2258.936035, 1591.272949, 1005.568969, 4, 82, 1 );
-	CreatePokerTable( 100000, 1000, 2261.936035, 1597.272949, 1005.568969, 5, 82, 1 );
-	CreatePokerTable( 50000, 500, 2264.936035, 1591.272949, 1005.568969, 5, 82, 1 );
-	CreatePokerTable( 25000, 250, 2267.936035, 1597.272949, 1005.568969, 6, 82, 1 );
-	CreatePokerTable( 12500, 125, 2270.936035, 1591.272949, 1005.568969, 6, 82, 1 );
+	CreatePokerTable( 250000, 25000, 2273.936035, 1597.272949, 1005.568969, 2, 82, 1 );
+	CreatePokerTable( 125000, 10000, 2252.936035, 1591.272949, 1005.568969, 2, 82, 1 );
+	CreatePokerTable( 100000, 5000, 2255.936035, 1597.272949, 1005.568969, 3, 82, 1 );
+	CreatePokerTable( 50000, 2500, 2258.936035, 1591.272949, 1005.568969, 4, 82, 1 );
+	CreatePokerTable( 25000, 1000, 2261.936035, 1597.272949, 1005.568969, 5, 82, 1 );
+	CreatePokerTable( 10000, 500, 2264.936035, 1591.272949, 1005.568969, 5, 82, 1 );
+	CreatePokerTable( 5000, 250, 2267.936035, 1597.272949, 1005.568969, 6, 82, 1 );
+	CreatePokerTable( 2500, 125, 2270.936035, 1591.272949, 1005.568969, 6, 82, 1 );
 	T_SendWarning("TPoker by ThreeKingz has been succesfully loaded!");
 	return 1;
 }
@@ -2600,7 +2600,7 @@ CMD:ctable(playerid, params[])
 	new Float:Pos[3];
 	GetPlayerPos(playerid, Pos[0], Pos[1], Pos[2]);
 	new table = CreatePokerTable(buy_in, small_blind, Pos[0], Pos[1], Pos[2]-0.6, seats, GetPlayerVirtualWorld(playerid), GetPlayerInterior(playerid));
-	SendPokerMessage(playerid, "You have created table ID: %d | Small blind: %s | Big blind: %s | Buy In: %s | Seats: %d", table, ConvertPrice(small_blind), ConvertPrice(small_blind*2), ConvertPrice(buy_in), seats);
+	SendPokerMessage(playerid, "You have created table ID: %d | Small blind: %s | Big blind: %s | Buy In: %s | Seats: %d", table, number_format(small_blind), number_format(small_blind*2), number_format(buy_in), seats);
 	return 1;
 }
 
diff --git a/pawno/include/irresistible/features/visage/roulette.inc b/pawno/include/irresistible/features/visage/roulette.inc
index becc838..76be515 100644
--- a/pawno/include/irresistible/features/visage/roulette.inc
+++ b/pawno/include/irresistible/features/visage/roulette.inc
@@ -228,7 +228,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
 						TextDrawShowForPlayer( i, g_rouletteNumberTD[ rouletteid ] );
 
 						if ( ! p_rouletteBetLocked{ i } ) {
-							SendServerMessage( i, "%s(%d) has waged %s with this spin, press SPACE to join the spin!", ReturnPlayerName( playerid ), playerid, ConvertPrice( totalBet ) );
+							SendServerMessage( i, "%s(%d) has waged %s with this spin, press SPACE to join the spin!", ReturnPlayerName( playerid ), playerid, number_format( totalBet ) );
 						}
 					}
 
@@ -243,7 +243,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
 					g_rouletteTableData[ rouletteid ] [ E_SPINNING_TIMER ] = SetTimerEx( "OnSpinRouletteTable", 25, false, "ddd", rouletteid, 0, 1 );
 
 					// inform other players
-					SendServerMessage( playerid, "You have begun the spin with a wager of %s. Good luck!", ConvertPrice( totalBet ) );
+					SendServerMessage( playerid, "You have begun the spin with a wager of %s. Good luck!", number_format( totalBet ) );
 				}
 				else SendServerMessage( playerid, "You have joined the spin. Good luck!" );
 			}
@@ -253,7 +253,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
 				if ( ( p_rouletteBetValue[ playerid ] /= 2 ) < 1000 )
 					p_rouletteBetValue[ playerid ] = 1000;
 
-				SendServerMessage( playerid, "You are now betting %s, gamble responsibly!", ConvertPrice( p_rouletteBetValue[ playerid ] ) );
+				SendServerMessage( playerid, "You are now betting %s, gamble responsibly!", number_format( p_rouletteBetValue[ playerid ] ) );
 			}
 
 			// increase bet
@@ -262,7 +262,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
 				if ( ( p_rouletteBetValue[ playerid ] *= 2 ) > g_rouletteTableData[ rouletteid ] [ E_MAX_BET ] )
 					p_rouletteBetValue[ playerid ] = g_rouletteTableData[ rouletteid ] [ E_MAX_BET ];
 
-				SendServerMessage( playerid, "You are now betting %s, gamble responsibly!", ConvertPrice( p_rouletteBetValue[ playerid ] ) );
+				SendServerMessage( playerid, "You are now betting %s, gamble responsibly!", number_format( p_rouletteBetValue[ playerid ] ) );
 			}
 
 			// Cancel Bets
@@ -304,7 +304,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
 
 					// Exceeded The Maximum
 					if ( totalBet + p_rouletteBetValue[ playerid ] > g_rouletteTableData[ rouletteid ] [ E_MAX_BET ] ) {
-						return SendError( playerid, "You are only allowed to bet a total of %s per spin on this table.", ConvertPrice( g_rouletteTableData[ rouletteid ] [ E_MAX_BET ] ) );
+						return SendError( playerid, "You are only allowed to bet a total of %s per spin on this table.", number_format( g_rouletteTableData[ rouletteid ] [ E_MAX_BET ] ) );
 					}
 
 					PlayerPlaySound( playerid, 1083, 0.0, 0.0, 5.0 );
@@ -343,7 +343,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
 						SetDynamicObjectMaterialText( g_rouletteChip[ playerid ] [ 0 ] [ column ], 0, " ", .backcolor = color );
 						g_rouletteChip[ playerid ] [ 1 ] [ column ] = CreateDynamicObject(1905, offsetX, offsetY, g_rouletteTableData[ rouletteid ] [ E_Z ] - height + 0.125, 0.0, 0.0, 0.0, .worldid = g_rouletteTableData[ rouletteid ] [ E_WORLD ], .priority = 9999);
 						SetDynamicObjectMaterialText( g_rouletteChip[ playerid ] [ 1 ] [ column ], 0, ConvertRouletteChipValue( g_rouletteChipValue[ playerid ] [ column ] ), 50, "Arial", 44, 1, color, -1, 1 );
-						g_rouletteChipLabel[ playerid ] [ column ] = CreateDynamic3DTextLabel( sprintf( "%s", ConvertPrice( g_rouletteChipValue[ playerid ] [ column ] ) ), g_rouletteChipColor[ playerid ], offsetX, offsetY, g_rouletteTableData[ rouletteid ] [ E_Z ] - 0.15 + ( float( playerid ) / 100 ), 5.0 ); //INVALID_PLAYER_ID, INVALID_VEHICLE_ID, 0, -1, -1, playerid );
+						g_rouletteChipLabel[ playerid ] [ column ] = CreateDynamic3DTextLabel( sprintf( "%s", number_format( g_rouletteChipValue[ playerid ] [ column ] ) ), g_rouletteChipColor[ playerid ], offsetX, offsetY, g_rouletteTableData[ rouletteid ] [ E_Z ] - 0.15 + ( float( playerid ) / 100 ), 5.0 ); //INVALID_PLAYER_ID, INVALID_VEHICLE_ID, 0, -1, -1, playerid );
 						//printf("(%s) CREATED CHIP %d:%d", ReturnPlayerName( playerid ), g_rouletteChip[ playerid ] [ column ], _: g_rouletteChipLabel[ playerid ] [ column ] );
 					}
 					else
@@ -351,7 +351,7 @@ hook OnPlayerKeyStateChange( playerid, newkeys, oldkeys )
 						SetDynamicObjectMaterialText( g_rouletteChip[ playerid ] [ 1 ] [ column ], 0, ConvertRouletteChipValue( g_rouletteChipValue[ playerid ] [ column ] ), 50, "Arial", 44, 1, color, -1, 1 );
 						SetDynamicObjectPos( g_rouletteChip[ playerid ] [ 0 ] [ column ], offsetX, offsetY, g_rouletteTableData[ rouletteid ] [ E_Z ] - height );
 						SetDynamicObjectPos( g_rouletteChip[ playerid ] [ 1 ] [ column ], offsetX, offsetY, g_rouletteTableData[ rouletteid ] [ E_Z ] - height + 0.125 );
-						UpdateDynamic3DTextLabelText( g_rouletteChipLabel[ playerid ] [ column ], g_rouletteChipColor[ playerid ], sprintf( "%s", ConvertPrice( g_rouletteChipValue[ playerid ] [ column ] ) ) );
+						UpdateDynamic3DTextLabelText( g_rouletteChipLabel[ playerid ] [ column ], g_rouletteChipColor[ playerid ], sprintf( "%s", number_format( g_rouletteChipValue[ playerid ] [ column ] ) ) );
 						//printf("(%s) UPDATED CHIP %d:%d", ReturnPlayerName( playerid ), g_rouletteChip[ playerid ] [ column ], _: g_rouletteChipLabel[ playerid ] [ column ] );
 					}
 				}
@@ -475,7 +475,7 @@ stock CreateRouletteTable( Float: X, Float: Y, Float: Z, Float: Angle, world, ma
 		X += 1.365 * floatcos( Angle + 98.0, degrees );
 		Y += 1.365 * floatsin( Angle + 98.0, degrees );
 
-		CreateDynamic3DTextLabel( sprintf( "Press ENTER To Play Roulette\n"COL_WHITE"%s Maximum", ConvertPrice( maxbet ) ), COLOR_GREY, X, Y, Z + 0.02, 15.0, INVALID_PLAYER_ID, INVALID_VEHICLE_ID, .worldid = world, .testlos = 0 );
+		CreateDynamic3DTextLabel( sprintf( "Press ENTER To Play Roulette\n"COL_WHITE"%s Maximum", number_format( maxbet ) ), COLOR_GREY, X, Y, Z + 0.02, 15.0, INVALID_PLAYER_ID, INVALID_VEHICLE_ID, .worldid = world, .testlos = 0 );
 
 		new Float: a_x = g_rouletteTableData[ id ] [ E_X ] + 1.4 * floatcos( Angle + 29.0, degrees );
 		new Float: a_y = g_rouletteTableData[ id ] [ E_Y ] + 1.4 * floatsin( Angle + 29.0, degrees );
@@ -687,7 +687,7 @@ public OnRouletteWheelStop( rouletteid, winner )
 
 		// inform users
 		if ( profit >= 10000 ) {
-			SendGlobalMessage( -1, ""COL_GREY"[CASINO]{FFFFFF} %s(%d) has won "COL_GOLD"%s"COL_WHITE" from roulette!", ReturnPlayerName( playerid ), playerid, ConvertPrice( profit ) );
+			SendGlobalMessage( -1, ""COL_GREY"[CASINO]{FFFFFF} %s(%d) has won "COL_GOLD"%s"COL_WHITE" from roulette!", ReturnPlayerName( playerid ), playerid, number_format( profit ) );
 		}
 
 		// give user points
@@ -695,12 +695,12 @@ public OnRouletteWheelStop( rouletteid, winner )
 
 		// gametext
 		if ( profit > 0 )  {
-		 	GameTextForPlayer( playerid, sprintf( "~n~~n~~g~%s won!", ConvertPrice( profit ) ), 4000, 3 );
-			SendClientMessageFormatted( playerid, -1, ""COL_GREY"[ROULETTE]"COL_WHITE" You have bet a total of %s and profited %s! (winning no %d)", ConvertPrice( waged ), ConvertPrice( profit ), winner );
+		 	GameTextForPlayer( playerid, sprintf( "~n~~n~~g~%s won!", number_format( profit ) ), 4000, 3 );
+			SendClientMessageFormatted( playerid, -1, ""COL_GREY"[ROULETTE]"COL_WHITE" You have bet a total of %s and profited %s! (winning no %d)", number_format( waged ), number_format( profit ), winner );
 		} else {
 			profit *= -1; // to improve the client message
 		 	GameTextForPlayer( playerid, "~n~~n~~r~No win!", 4000, 3 );
-			SendClientMessageFormatted( playerid, -1, ""COL_GREY"[ROULETTE]"COL_WHITE" You have bet a total of %s and lost %s! (winning no %d)", ConvertPrice( waged ), ConvertPrice( profit ), winner );
+			SendClientMessageFormatted( playerid, -1, ""COL_GREY"[ROULETTE]"COL_WHITE" You have bet a total of %s and lost %s! (winning no %d)", number_format( waged ), number_format( profit ), winner );
 		}
 	}
 
diff --git a/pawno/include/irresistible/helpers.inc b/pawno/include/irresistible/helpers.inc
index 51d0e24..ffecb5c 100644
--- a/pawno/include/irresistible/helpers.inc
+++ b/pawno/include/irresistible/helpers.inc
@@ -231,19 +231,73 @@ stock Player_GetUnusedAttachIndex( playerid )
 }
 
 // purpose: convert integer into dollar string
-stock ConvertPrice( iValue, iCashSign = 1 )
+stock number_format( { _, Float, Text3D, Menu, Text, DB, DBResult, bool, File }: variable, prefix = '$', decimals = 2, thousand_seperator = ',', decimal_point = '.', tag = tagof( variable ) ) // by Slice
 {
     static
-        szNum[ 32 ];
+        s_szReturn[ 32 ],
+        s_szThousandSeparator[ 2 ] = { ' ', EOS },
+        s_iDecimalPos,
+        s_iChar,
+        s_iSepPos
+    ;
 
-    format( szNum, sizeof( szNum ), "%d", iValue < 0 ? -iValue : iValue );
+    if ( tag == tagof( bool: ) )
+    {
+        if ( variable )
+            memcpy( s_szReturn, "true", 0, 5 * ( cellbits / 8 ) );
+        else
+            memcpy( s_szReturn, "false", 0, 6 * ( cellbits / 8 ) );
 
-    for( new i = strlen( szNum ) - 3; i > 0; i -= 3 ) {
-        strins( szNum, ",", i, sizeof( szNum ) );
+        return s_szReturn;
+    }
+    else if ( tag == tagof( Float: ) )
+    {
+        if ( decimals == -1 )
+            decimals = 8;
+
+        format( s_szReturn, sizeof( s_szReturn ), "%.*f", decimals, variable );
+    }
+    else
+    {
+        format( s_szReturn, sizeof( s_szReturn ), "%d", variable );
+
+        if ( decimals > 0 )
+        {
+            strcat( s_szReturn, "." );
+
+            while ( decimals-- )
+                strcat( s_szReturn, "0" );
+        }
     }
 
-    if ( iCashSign ) strins( szNum, "$", 0 );
-    if ( iValue < 0 ) strins( szNum, "-", 0, sizeof( szNum ) );
+    s_iDecimalPos = strfind( s_szReturn, "." );
 
-    return szNum;
+    if ( s_iDecimalPos == -1 )
+        s_iDecimalPos = strlen( s_szReturn );
+    else
+        s_szReturn[ s_iDecimalPos ] = decimal_point;
+
+    if ( s_iDecimalPos >= 4 && thousand_seperator )
+    {
+        s_szThousandSeparator[ 0 ] = thousand_seperator;
+
+        s_iChar = s_iDecimalPos;
+        s_iSepPos = 0;
+
+        while ( --s_iChar > 0 )
+        {
+            if ( ++s_iSepPos == 3 )
+            {
+                strins( s_szReturn, s_szThousandSeparator, s_iChar );
+
+                s_iSepPos = 0;
+            }
+        }
+    }
+
+    if ( prefix != '\0' ) {
+        // new minus = strfind( s_szReturn, "-" );
+        strins( s_szReturn, "$", variable < 0 ); // no point finding -
+    }
+    return s_szReturn;
 }
diff --git a/pawno/include/irresistible/main.inc b/pawno/include/irresistible/main.inc
index 4c45f03..d7cde8a 100644
--- a/pawno/include/irresistible/main.inc
+++ b/pawno/include/irresistible/main.inc
@@ -38,6 +38,7 @@
 #include < irresistible\features\visage\fireworks >
 #include < irresistible\features\visage\casino >
 #include < irresistible\features\visage\apartments >
+// #include < irresistible\features\visage\boxing >
 
 // static cnr features
 #include < irresistible\cnr\static\actors >