diff --git a/src/models/fika/routes/raid/dedicated/IStartDedicatedRequest.ts b/src/models/fika/routes/raid/dedicated/IStartDedicatedRequest.ts
index 63f80713..c5aa6529 100644
--- a/src/models/fika/routes/raid/dedicated/IStartDedicatedRequest.ts
+++ b/src/models/fika/routes/raid/dedicated/IStartDedicatedRequest.ts
@@ -1,7 +1,7 @@
-import { BotSettings, TimeAndWeatherSettings, WavesSettings } from "@spt-aki/models/eft/match/IRaidSettings";
-import { DateTime } from "@spt-aki/models/enums/DateTime";
-import { PlayersSpawnPlace } from "@spt-aki/models/enums/PlayersSpawnPlace";
-import { SideType } from "@spt-aki/models/enums/SideType";
+import { BotSettings, TimeAndWeatherSettings, WavesSettings } from "@spt/models/eft/match/IRaidSettings";
+import { DateTime } from "@spt/models/enums/DateTime";
+import { PlayersSpawnPlace } from "@spt/models/enums/PlayersSpawnPlace";
+import { SideType } from "@spt/models/enums/SideType";
 
 export interface IStartDedicatedRequest {
     expectedNumberOfPlayers: number;
@@ -13,4 +13,5 @@ export interface IStartDedicatedRequest {
     botSettings: BotSettings;
     wavesSettings: WavesSettings;
     side: SideType;
+    customWeather: boolean;
 }
diff --git a/types/controllers/BotController.d.ts b/types/controllers/BotController.d.ts
index 6431fca0..475f51b8 100644
--- a/types/controllers/BotController.d.ts
+++ b/types/controllers/BotController.d.ts
@@ -20,8 +20,8 @@ import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { MatchBotDetailsCacheService } from "@spt/services/MatchBotDetailsCacheService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotController {
     protected logger: ILogger;
     protected databaseService: DatabaseService;
diff --git a/types/controllers/BuildController.d.ts b/types/controllers/BuildController.d.ts
index ed8adf6c..2cb9c59a 100644
--- a/types/controllers/BuildController.d.ts
+++ b/types/controllers/BuildController.d.ts
@@ -9,8 +9,8 @@ import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BuildController {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/controllers/GameController.d.ts b/types/controllers/GameController.d.ts
index 533a81c2..e219c04d 100644
--- a/types/controllers/GameController.d.ts
+++ b/types/controllers/GameController.d.ts
@@ -34,10 +34,10 @@ import { ProfileActivityService } from "@spt/services/ProfileActivityService";
 import { ProfileFixerService } from "@spt/services/ProfileFixerService";
 import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class GameController {
     protected logger: ILogger;
     protected databaseService: DatabaseService;
diff --git a/types/controllers/HealthController.d.ts b/types/controllers/HealthController.d.ts
index 54822833..5a0a0a69 100644
--- a/types/controllers/HealthController.d.ts
+++ b/types/controllers/HealthController.d.ts
@@ -12,8 +12,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { EventOutputHolder } from "@spt/routers/EventOutputHolder";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { PaymentService } from "@spt/services/PaymentService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class HealthController {
     protected logger: ILogger;
     protected eventOutputHolder: EventOutputHolder;
diff --git a/types/controllers/HideoutController.d.ts b/types/controllers/HideoutController.d.ts
index e9d1ed96..89a428c5 100644
--- a/types/controllers/HideoutController.d.ts
+++ b/types/controllers/HideoutController.d.ts
@@ -35,11 +35,11 @@ import { FenceService } from "@spt/services/FenceService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { PlayerService } from "@spt/services/PlayerService";
 import { ProfileActivityService } from "@spt/services/ProfileActivityService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class HideoutController {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/controllers/InraidController.d.ts b/types/controllers/InraidController.d.ts
index 87f419b6..9f0c4094 100644
--- a/types/controllers/InraidController.d.ts
+++ b/types/controllers/InraidController.d.ts
@@ -13,6 +13,7 @@ import { ISaveProgressRequestData } from "@spt/models/eft/inRaid/ISaveProgressRe
 import { PlayerRaidEndState } from "@spt/models/enums/PlayerRaidEndState";
 import { IAirdropConfig } from "@spt/models/spt/config/IAirdropConfig";
 import { IBTRConfig } from "@spt/models/spt/config/IBTRConfig";
+import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
 import { IHideoutConfig } from "@spt/models/spt/config/IHideoutConfig";
 import { IInRaidConfig } from "@spt/models/spt/config/IInRaidConfig";
 import { ILocationConfig } from "@spt/models/spt/config/ILocationConfig";
@@ -31,7 +32,6 @@ import { PmcChatResponseService } from "@spt/services/PmcChatResponseService";
 import { TraderServicesService } from "@spt/services/TraderServicesService";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
-import { IBotConfig } from "@spt/models/spt/config/IBotConfig";
 /**
  * Logic for handling In Raid callbacks
  */
diff --git a/types/controllers/InsuranceController.d.ts b/types/controllers/InsuranceController.d.ts
index f921b83a..543e915c 100644
--- a/types/controllers/InsuranceController.d.ts
+++ b/types/controllers/InsuranceController.d.ts
@@ -21,11 +21,11 @@ import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
 import { PaymentService } from "@spt/services/PaymentService";
 import { RagfairPriceService } from "@spt/services/RagfairPriceService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { MathUtil } from "@spt/utils/MathUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class InsuranceController {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
diff --git a/types/controllers/InventoryController.d.ts b/types/controllers/InventoryController.d.ts
index 40bb0849..c986ce8c 100644
--- a/types/controllers/InventoryController.d.ts
+++ b/types/controllers/InventoryController.d.ts
@@ -37,10 +37,10 @@ import { LocalisationService } from "@spt/services/LocalisationService";
 import { MapMarkerService } from "@spt/services/MapMarkerService";
 import { PlayerService } from "@spt/services/PlayerService";
 import { RagfairOfferService } from "@spt/services/RagfairOfferService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class InventoryController {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/controllers/LocationController.d.ts b/types/controllers/LocationController.d.ts
index 727a8c8c..a541b9ce 100644
--- a/types/controllers/LocationController.d.ts
+++ b/types/controllers/LocationController.d.ts
@@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService";
 import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { RaidTimeAdjustmentService } from "@spt/services/RaidTimeAdjustmentService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class LocationController {
     protected hashUtil: HashUtil;
     protected randomUtil: RandomUtil;
diff --git a/types/controllers/ProfileController.d.ts b/types/controllers/ProfileController.d.ts
index e8dae73c..7e6d35c1 100644
--- a/types/controllers/ProfileController.d.ts
+++ b/types/controllers/ProfileController.d.ts
@@ -26,9 +26,9 @@ import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
 import { ProfileFixerService } from "@spt/services/ProfileFixerService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class ProfileController {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/controllers/QuestController.d.ts b/types/controllers/QuestController.d.ts
index 3cdce00f..6a5b415a 100644
--- a/types/controllers/QuestController.d.ts
+++ b/types/controllers/QuestController.d.ts
@@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
 import { PlayerService } from "@spt/services/PlayerService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class QuestController {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
diff --git a/types/controllers/RepeatableQuestController.d.ts b/types/controllers/RepeatableQuestController.d.ts
index 74f39eb5..016f8c61 100644
--- a/types/controllers/RepeatableQuestController.d.ts
+++ b/types/controllers/RepeatableQuestController.d.ts
@@ -18,11 +18,11 @@ import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { PaymentService } from "@spt/services/PaymentService";
 import { ProfileFixerService } from "@spt/services/ProfileFixerService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { ObjectId } from "@spt/utils/ObjectId";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class RepeatableQuestController {
     protected logger: ILogger;
     protected databaseService: DatabaseService;
diff --git a/types/controllers/TradeController.d.ts b/types/controllers/TradeController.d.ts
index bc72e924..842a97b4 100644
--- a/types/controllers/TradeController.d.ts
+++ b/types/controllers/TradeController.d.ts
@@ -1,5 +1,6 @@
 import { ItemHelper } from "@spt/helpers/ItemHelper";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
+import { RagfairOfferHelper } from "@spt/helpers/RagfairOfferHelper";
 import { TradeHelper } from "@spt/helpers/TradeHelper";
 import { TraderHelper } from "@spt/helpers/TraderHelper";
 import { IPmcData } from "@spt/models/eft/common/IPmcData";
@@ -35,6 +36,7 @@ export declare class TradeController {
     protected hashUtil: HashUtil;
     protected itemHelper: ItemHelper;
     protected profileHelper: ProfileHelper;
+    protected ragfairOfferHelper: RagfairOfferHelper;
     protected traderHelper: TraderHelper;
     protected ragfairServer: RagfairServer;
     protected httpResponse: HttpResponseUtil;
@@ -44,7 +46,7 @@ export declare class TradeController {
     protected configServer: ConfigServer;
     protected ragfairConfig: IRagfairConfig;
     protected traderConfig: ITraderConfig;
-    constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer);
+    constructor(logger: ILogger, databaseService: DatabaseService, eventOutputHolder: EventOutputHolder, tradeHelper: TradeHelper, timeUtil: TimeUtil, randomUtil: RandomUtil, hashUtil: HashUtil, itemHelper: ItemHelper, profileHelper: ProfileHelper, ragfairOfferHelper: RagfairOfferHelper, traderHelper: TraderHelper, ragfairServer: RagfairServer, httpResponse: HttpResponseUtil, localisationService: LocalisationService, ragfairPriceService: RagfairPriceService, mailSendService: MailSendService, configServer: ConfigServer);
     /** Handle TradingConfirm event */
     confirmTrading(pmcData: IPmcData, request: IProcessBaseTradeRequestData, sessionID: string): IItemEventRouterResponse;
     /** Handle RagFairBuyOffer event */
@@ -67,10 +69,17 @@ export declare class TradeController {
      * @param output Output to send back to client
      */
     protected buyPmcItemFromRagfair(sessionId: string, pmcData: IPmcData, fleaOffer: IRagfairOffer, requestOffer: IOfferRequest, output: IItemEventRouterResponse): void;
+    /**
+     * Is the provided offerid and ownerid from a player made offer
+     * @param offerId Id of the offer
+     * @param offerOwnerId Owner id
+     * @returns true if offer was made by a player
+     */
+    protected isPlayerOffer(offerId: string, offerOwnerId: string): boolean;
     /**
      * Does Player have necessary trader loyalty to purchase flea offer
      * @param sellerIsTrader is seller trader
-     * @param fleaOffer FLea offer being bought
+     * @param fleaOffer Flea offer being bought
      * @param pmcData Player profile
      * @returns True if player can buy offer
      */
diff --git a/types/controllers/TraderController.d.ts b/types/controllers/TraderController.d.ts
index 7fc6d786..3592fc66 100644
--- a/types/controllers/TraderController.d.ts
+++ b/types/controllers/TraderController.d.ts
@@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService";
 import { FenceService } from "@spt/services/FenceService";
 import { TraderAssortService } from "@spt/services/TraderAssortService";
 import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class TraderController {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
diff --git a/types/generators/BotEquipmentModGenerator.d.ts b/types/generators/BotEquipmentModGenerator.d.ts
index 419120ff..3952293f 100644
--- a/types/generators/BotEquipmentModGenerator.d.ts
+++ b/types/generators/BotEquipmentModGenerator.d.ts
@@ -25,9 +25,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotEquipmentModGenerator {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
@@ -65,7 +65,7 @@ export declare class BotEquipmentModGenerator {
      * @param settings Bot equipment generation settings
      * @param modSlot Armor slot being filtered
      * @param existingPlateTplPool Plates tpls to choose from
-     * @param armorItem
+     * @param armorItem The armor items db template
      * @returns Array of plate tpls to choose from
      */
     protected filterPlateModsForSlotByLevel(settings: IGenerateEquipmentProperties, modSlot: string, existingPlateTplPool: string[], armorItem: ITemplateItem): IFilterPlateModsForSlotByLevelResult;
diff --git a/types/generators/BotGenerator.d.ts b/types/generators/BotGenerator.d.ts
index 8ab43712..ebb8a599 100644
--- a/types/generators/BotGenerator.d.ts
+++ b/types/generators/BotGenerator.d.ts
@@ -16,10 +16,10 @@ import { DatabaseService } from "@spt/services/DatabaseService";
 import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotGenerator {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/generators/BotLevelGenerator.d.ts b/types/generators/BotLevelGenerator.d.ts
index dee61e2d..a8a88951 100644
--- a/types/generators/BotLevelGenerator.d.ts
+++ b/types/generators/BotLevelGenerator.d.ts
@@ -4,12 +4,14 @@ import { IBotBase } from "@spt/models/eft/common/tables/IBotBase";
 import { BotGenerationDetails } from "@spt/models/spt/bots/BotGenerationDetails";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
+import { MathUtil } from "@spt/utils/MathUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 export declare class BotLevelGenerator {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
     protected databaseService: DatabaseService;
-    constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService);
+    protected mathUtil: MathUtil;
+    constructor(logger: ILogger, randomUtil: RandomUtil, databaseService: DatabaseService, mathUtil: MathUtil);
     /**
      * Return a randomised bot level and exp value
      * @param levelDetails Min and max of level for bot
@@ -18,6 +20,7 @@ export declare class BotLevelGenerator {
      * @returns IRandomisedBotLevelResult object
      */
     generateBotLevel(levelDetails: MinMax, botGenerationDetails: BotGenerationDetails, bot: IBotBase): IRandomisedBotLevelResult;
+    protected chooseBotLevel(min: number, max: number, shift: number, number: number): number;
     /**
      * Get the highest level a bot can be relative to the players level, but no further than the max size from globals.exp_table
      * @param botGenerationDetails Details to help generate a bot
diff --git a/types/generators/BotLootGenerator.d.ts b/types/generators/BotLootGenerator.d.ts
index fee56ce5..c0583c6c 100644
--- a/types/generators/BotLootGenerator.d.ts
+++ b/types/generators/BotLootGenerator.d.ts
@@ -18,9 +18,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer";
 import { BotLootCacheService } from "@spt/services/BotLootCacheService";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotLootGenerator {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/generators/BotWeaponGenerator.d.ts b/types/generators/BotWeaponGenerator.d.ts
index 5559bfad..8e03b35e 100644
--- a/types/generators/BotWeaponGenerator.d.ts
+++ b/types/generators/BotWeaponGenerator.d.ts
@@ -18,9 +18,9 @@ import { BotWeaponModLimitService } from "@spt/services/BotWeaponModLimitService
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { RepairService } from "@spt/services/RepairService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotWeaponGenerator {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/generators/LocationGenerator.d.ts b/types/generators/LocationGenerator.d.ts
index 222b0ab0..9a2b0c45 100644
--- a/types/generators/LocationGenerator.d.ts
+++ b/types/generators/LocationGenerator.d.ts
@@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService";
 import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { MathUtil } from "@spt/utils/MathUtil";
 import { ObjectId } from "@spt/utils/ObjectId";
 import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export interface IContainerItem {
     items: Item[];
     width: number;
diff --git a/types/generators/PlayerScavGenerator.d.ts b/types/generators/PlayerScavGenerator.d.ts
index 24141505..e317bf68 100644
--- a/types/generators/PlayerScavGenerator.d.ts
+++ b/types/generators/PlayerScavGenerator.d.ts
@@ -14,9 +14,9 @@ import { BotLootCacheService } from "@spt/services/BotLootCacheService";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { FenceService } from "@spt/services/FenceService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class PlayerScavGenerator {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
diff --git a/types/generators/RagfairOfferGenerator.d.ts b/types/generators/RagfairOfferGenerator.d.ts
index 9435390a..ca097293 100644
--- a/types/generators/RagfairOfferGenerator.d.ts
+++ b/types/generators/RagfairOfferGenerator.d.ts
@@ -19,10 +19,10 @@ import { FenceService } from "@spt/services/FenceService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { RagfairOfferService } from "@spt/services/RagfairOfferService";
 import { RagfairPriceService } from "@spt/services/RagfairPriceService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class RagfairOfferGenerator {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/generators/RepeatableQuestGenerator.d.ts b/types/generators/RepeatableQuestGenerator.d.ts
index 77c4e792..339f322e 100644
--- a/types/generators/RepeatableQuestGenerator.d.ts
+++ b/types/generators/RepeatableQuestGenerator.d.ts
@@ -11,10 +11,10 @@ import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { MathUtil } from "@spt/utils/MathUtil";
 import { ObjectId } from "@spt/utils/ObjectId";
 import { ProbabilityObjectArray, RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class RepeatableQuestGenerator {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
diff --git a/types/generators/RepeatableQuestRewardGenerator.d.ts b/types/generators/RepeatableQuestRewardGenerator.d.ts
index 1e099945..713a394a 100644
--- a/types/generators/RepeatableQuestRewardGenerator.d.ts
+++ b/types/generators/RepeatableQuestRewardGenerator.d.ts
@@ -12,10 +12,10 @@ import { DatabaseService } from "@spt/services/DatabaseService";
 import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { MathUtil } from "@spt/utils/MathUtil";
 import { ObjectId } from "@spt/utils/ObjectId";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class RepeatableQuestRewardGenerator {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
diff --git a/types/helpers/BotDifficultyHelper.d.ts b/types/helpers/BotDifficultyHelper.d.ts
index 63572a56..2348bd33 100644
--- a/types/helpers/BotDifficultyHelper.d.ts
+++ b/types/helpers/BotDifficultyHelper.d.ts
@@ -5,8 +5,8 @@ import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BotDifficultyHelper {
     protected logger: ILogger;
     protected databaseService: DatabaseService;
diff --git a/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts b/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts
index c51bf7eb..c38f0a00 100644
--- a/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts
+++ b/types/helpers/Dialogue/Commando/SptCommands/GiveCommand/GiveSptCommand.d.ts
@@ -10,8 +10,8 @@ import { DatabaseService } from "@spt/services/DatabaseService";
 import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocaleService } from "@spt/services/LocaleService";
 import { MailSendService } from "@spt/services/MailSendService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class GiveSptCommand implements ISptCommand {
     protected logger: ILogger;
     protected itemHelper: ItemHelper;
diff --git a/types/helpers/HealthHelper.d.ts b/types/helpers/HealthHelper.d.ts
index 650f6331..a164285e 100644
--- a/types/helpers/HealthHelper.d.ts
+++ b/types/helpers/HealthHelper.d.ts
@@ -5,8 +5,8 @@ import { IHealthConfig } from "@spt/models/spt/config/IHealthConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class HealthHelper {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
diff --git a/types/helpers/HideoutHelper.d.ts b/types/helpers/HideoutHelper.d.ts
index c4aaa4c8..df0376b5 100644
--- a/types/helpers/HideoutHelper.d.ts
+++ b/types/helpers/HideoutHelper.d.ts
@@ -18,10 +18,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { PlayerService } from "@spt/services/PlayerService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class HideoutHelper {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/helpers/InRaidHelper.d.ts b/types/helpers/InRaidHelper.d.ts
index 449be9fa..987c9ec3 100644
--- a/types/helpers/InRaidHelper.d.ts
+++ b/types/helpers/InRaidHelper.d.ts
@@ -15,9 +15,9 @@ import { SaveServer } from "@spt/servers/SaveServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { ProfileFixerService } from "@spt/services/ProfileFixerService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class InRaidHelper {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
diff --git a/types/helpers/InventoryHelper.d.ts b/types/helpers/InventoryHelper.d.ts
index f0ff69af..92bb49c6 100644
--- a/types/helpers/InventoryHelper.d.ts
+++ b/types/helpers/InventoryHelper.d.ts
@@ -23,9 +23,9 @@ import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 import { FenceService } from "@spt/services/FenceService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class InventoryHelper {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/helpers/ItemHelper.d.ts b/types/helpers/ItemHelper.d.ts
index da5dd115..c304ceee 100644
--- a/types/helpers/ItemHelper.d.ts
+++ b/types/helpers/ItemHelper.d.ts
@@ -11,13 +11,13 @@ import { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
 import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocaleService } from "@spt/services/LocaleService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { CompareUtil } from "@spt/utils/CompareUtil";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { JsonUtil } from "@spt/utils/JsonUtil";
 import { MathUtil } from "@spt/utils/MathUtil";
 import { ObjectId } from "@spt/utils/ObjectId";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class ItemHelper {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/helpers/ProfileHelper.d.ts b/types/helpers/ProfileHelper.d.ts
index 06711792..cdab870b 100644
--- a/types/helpers/ProfileHelper.d.ts
+++ b/types/helpers/ProfileHelper.d.ts
@@ -11,10 +11,10 @@ import { SaveServer } from "@spt/servers/SaveServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { ProfileSnapshotService } from "@spt/services/ProfileSnapshotService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
 import { Watermark } from "@spt/utils/Watermark";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class ProfileHelper {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/helpers/QuestHelper.d.ts b/types/helpers/QuestHelper.d.ts
index 2b84b8f6..2d5730da 100644
--- a/types/helpers/QuestHelper.d.ts
+++ b/types/helpers/QuestHelper.d.ts
@@ -23,9 +23,9 @@ import { LocaleService } from "@spt/services/LocaleService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
 import { SeasonalEventService } from "@spt/services/SeasonalEventService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class QuestHelper {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
diff --git a/types/helpers/RagfairOfferHelper.d.ts b/types/helpers/RagfairOfferHelper.d.ts
index b5265542..2386316e 100644
--- a/types/helpers/RagfairOfferHelper.d.ts
+++ b/types/helpers/RagfairOfferHelper.d.ts
@@ -151,7 +151,7 @@ export declare class RagfairOfferHelper {
      * @param boughtAmount Amount item was purchased for
      * @returns IItemEventRouterResponse
      */
-    protected completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse;
+    completeOffer(sessionID: string, offer: IRagfairOffer, boughtAmount: number): IItemEventRouterResponse;
     /**
      * Get a localised message for when players offer has sold on flea
      * @param itemTpl Item sold
diff --git a/types/helpers/RagfairServerHelper.d.ts b/types/helpers/RagfairServerHelper.d.ts
index 927caf59..3e1fea9b 100644
--- a/types/helpers/RagfairServerHelper.d.ts
+++ b/types/helpers/RagfairServerHelper.d.ts
@@ -12,9 +12,9 @@ import { DatabaseService } from "@spt/services/DatabaseService";
 import { ItemFilterService } from "@spt/services/ItemFilterService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 /**
  * Helper class for common ragfair server actions
  */
diff --git a/types/helpers/RepairHelper.d.ts b/types/helpers/RepairHelper.d.ts
index 99a21da7..63c78c9b 100644
--- a/types/helpers/RepairHelper.d.ts
+++ b/types/helpers/RepairHelper.d.ts
@@ -4,8 +4,8 @@ import { IRepairConfig } from "@spt/models/spt/config/IRepairConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class RepairHelper {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
diff --git a/types/helpers/RepeatableQuestHelper.d.ts b/types/helpers/RepeatableQuestHelper.d.ts
index d92657ee..8c65f40d 100644
--- a/types/helpers/RepeatableQuestHelper.d.ts
+++ b/types/helpers/RepeatableQuestHelper.d.ts
@@ -1,8 +1,8 @@
 import { IEliminationConfig, IQuestConfig, IRepeatableQuestConfig } from "@spt/models/spt/config/IQuestConfig";
 import { ConfigServer } from "@spt/servers/ConfigServer";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { MathUtil } from "@spt/utils/MathUtil";
 import { ProbabilityObject, ProbabilityObjectArray } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class RepeatableQuestHelper {
     protected mathUtil: MathUtil;
     protected configServer: ConfigServer;
diff --git a/types/helpers/TradeHelper.d.ts b/types/helpers/TradeHelper.d.ts
index f994fda4..6e6f3a25 100644
--- a/types/helpers/TradeHelper.d.ts
+++ b/types/helpers/TradeHelper.d.ts
@@ -17,8 +17,8 @@ import { FenceService } from "@spt/services/FenceService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { PaymentService } from "@spt/services/PaymentService";
 import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class TradeHelper {
     protected logger: ILogger;
     protected eventOutputHolder: EventOutputHolder;
diff --git a/types/helpers/TraderAssortHelper.d.ts b/types/helpers/TraderAssortHelper.d.ts
index 8f8f8020..f1ecd3b6 100644
--- a/types/helpers/TraderAssortHelper.d.ts
+++ b/types/helpers/TraderAssortHelper.d.ts
@@ -14,9 +14,9 @@ import { FenceService } from "@spt/services/FenceService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { TraderAssortService } from "@spt/services/TraderAssortService";
 import { TraderPurchasePersisterService } from "@spt/services/TraderPurchasePersisterService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { MathUtil } from "@spt/utils/MathUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class TraderAssortHelper {
     protected logger: ILogger;
     protected mathUtil: MathUtil;
diff --git a/types/loaders/BundleLoader.d.ts b/types/loaders/BundleLoader.d.ts
index e2709882..8c0ed4d2 100644
--- a/types/loaders/BundleLoader.d.ts
+++ b/types/loaders/BundleLoader.d.ts
@@ -1,8 +1,8 @@
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
 import { BundleHashCacheService } from "@spt/services/cache/BundleHashCacheService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { JsonUtil } from "@spt/utils/JsonUtil";
 import { VFS } from "@spt/utils/VFS";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class BundleInfo {
     modpath: string;
     filename: string;
diff --git a/types/loaders/PostDBModLoader.d.ts b/types/loaders/PostDBModLoader.d.ts
index b0c4bf49..a8bb6a99 100644
--- a/types/loaders/PostDBModLoader.d.ts
+++ b/types/loaders/PostDBModLoader.d.ts
@@ -1,10 +1,10 @@
-import { DependencyContainer } from "tsyringe";
 import { OnLoad } from "@spt/di/OnLoad";
 import { BundleLoader } from "@spt/loaders/BundleLoader";
 import { ModTypeCheck } from "@spt/loaders/ModTypeCheck";
 import { PreSptModLoader } from "@spt/loaders/PreSptModLoader";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { LocalisationService } from "@spt/services/LocalisationService";
+import { DependencyContainer } from "tsyringe";
 export declare class PostDBModLoader implements OnLoad {
     protected logger: ILogger;
     protected bundleLoader: BundleLoader;
diff --git a/types/loaders/PostSptModLoader.d.ts b/types/loaders/PostSptModLoader.d.ts
index fb545798..26034970 100644
--- a/types/loaders/PostSptModLoader.d.ts
+++ b/types/loaders/PostSptModLoader.d.ts
@@ -1,9 +1,9 @@
-import { DependencyContainer } from "tsyringe";
 import { ModTypeCheck } from "@spt/loaders/ModTypeCheck";
 import { PreSptModLoader } from "@spt/loaders/PreSptModLoader";
 import { IModLoader } from "@spt/models/spt/mod/IModLoader";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { LocalisationService } from "@spt/services/LocalisationService";
+import { DependencyContainer } from "tsyringe";
 export declare class PostSptModLoader implements IModLoader {
     protected logger: ILogger;
     protected preSptModLoader: PreSptModLoader;
diff --git a/types/loaders/PreSptModLoader.d.ts b/types/loaders/PreSptModLoader.d.ts
index bc846c89..88145256 100644
--- a/types/loaders/PreSptModLoader.d.ts
+++ b/types/loaders/PreSptModLoader.d.ts
@@ -1,4 +1,3 @@
-import { DependencyContainer } from "tsyringe";
 import { ModLoadOrder } from "@spt/loaders/ModLoadOrder";
 import { ModTypeCheck } from "@spt/loaders/ModTypeCheck";
 import { ModDetails } from "@spt/models/eft/profile/ISptProfile";
@@ -11,6 +10,7 @@ import { LocalisationService } from "@spt/services/LocalisationService";
 import { ModCompilerService } from "@spt/services/ModCompilerService";
 import { JsonUtil } from "@spt/utils/JsonUtil";
 import { VFS } from "@spt/utils/VFS";
+import { DependencyContainer } from "tsyringe";
 export declare class PreSptModLoader implements IModLoader {
     protected logger: ILogger;
     protected vfs: VFS;
diff --git a/types/models/eft/common/IEmptyRequestData.d.ts b/types/models/eft/common/IEmptyRequestData.d.ts
index 284d16e2..52a7b126 100644
--- a/types/models/eft/common/IEmptyRequestData.d.ts
+++ b/types/models/eft/common/IEmptyRequestData.d.ts
@@ -1,2 +1 @@
-export interface IEmptyRequestData {
-}
+export type IEmptyRequestData = {};
diff --git a/types/models/eft/common/tables/IBotBase.d.ts b/types/models/eft/common/tables/IBotBase.d.ts
index a7fe1cae..be37845f 100644
--- a/types/models/eft/common/tables/IBotBase.d.ts
+++ b/types/models/eft/common/tables/IBotBase.d.ts
@@ -373,8 +373,7 @@ export interface LastCompleted {
 export interface Notes {
     Notes: Note[];
 }
-export interface CarExtractCounts {
-}
+export type CarExtractCounts = {};
 export declare enum SurvivorClass {
     UNKNOWN = 0,
     NEUTRALIZER = 1,
diff --git a/types/models/eft/common/tables/ILocationsBase.d.ts b/types/models/eft/common/tables/ILocationsBase.d.ts
index 2c96af34..16bca247 100644
--- a/types/models/eft/common/tables/ILocationsBase.d.ts
+++ b/types/models/eft/common/tables/ILocationsBase.d.ts
@@ -2,8 +2,7 @@ export interface ILocationsBase {
     locations: Locations;
     paths: Path[];
 }
-export interface Locations {
-}
+export type Locations = {};
 export interface Path {
     Source: string;
     Destination: string;
diff --git a/types/models/eft/common/tables/IProfileTemplate.d.ts b/types/models/eft/common/tables/IProfileTemplate.d.ts
index 20923bc2..6ba92217 100644
--- a/types/models/eft/common/tables/IProfileTemplate.d.ts
+++ b/types/models/eft/common/tables/IProfileTemplate.d.ts
@@ -1,12 +1,12 @@
 import { IPmcData } from "@spt/models/eft/common/IPmcData";
 import { Dialogue, IUserBuilds } from "@spt/models/eft/profile/ISptProfile";
 export interface IProfileTemplates {
-    "Standard": IProfileSides;
+    Standard: IProfileSides;
     "Left Behind": IProfileSides;
     "Prepare To Escape": IProfileSides;
     "Edge Of Darkness": IProfileSides;
-    "Unheard": IProfileSides;
-    "Tournament": IProfileSides;
+    Unheard: IProfileSides;
+    Tournament: IProfileSides;
     "SPT Developer": IProfileSides;
     "SPT Easy start": IProfileSides;
     "SPT Zero to hero": IProfileSides;
diff --git a/types/models/eft/common/tables/ITrader.d.ts b/types/models/eft/common/tables/ITrader.d.ts
index 14ab409a..40cf0047 100644
--- a/types/models/eft/common/tables/ITrader.d.ts
+++ b/types/models/eft/common/tables/ITrader.d.ts
@@ -1,4 +1,5 @@
 import { Item } from "@spt/models/eft/common/tables/IItem";
+import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide";
 import { ITraderServiceModel } from "@spt/models/spt/services/ITraderServiceModel";
 export interface ITrader {
     assort?: ITraderAssort;
@@ -78,6 +79,8 @@ export interface IBarterScheme {
     _tpl: string;
     onlyFunctional?: boolean;
     sptQuestLocked?: boolean;
+    level?: number;
+    side?: DogtagExchangeSide;
 }
 export interface ISuit {
     _id: string;
diff --git a/types/models/eft/hideout/IQteData.d.ts b/types/models/eft/hideout/IQteData.d.ts
index 7f507e1c..fe6cce64 100644
--- a/types/models/eft/hideout/IQteData.d.ts
+++ b/types/models/eft/hideout/IQteData.d.ts
@@ -1,14 +1,14 @@
 import { Effect } from "@spt/models/eft/health/Effect";
 import { BodyPart } from "@spt/models/eft/health/IOffraidHealRequestData";
+import { HideoutAreas } from "@spt/models/enums/HideoutAreas";
+import { SkillTypes } from "@spt/models/enums/SkillTypes";
+import { Traders } from "@spt/models/enums/Traders";
 import { QteActivityType } from "@spt/models/enums/hideout/QteActivityType";
 import { QteEffectType } from "@spt/models/enums/hideout/QteEffectType";
 import { QteResultType } from "@spt/models/enums/hideout/QteResultType";
 import { QteRewardType } from "@spt/models/enums/hideout/QteRewardType";
 import { QteType } from "@spt/models/enums/hideout/QteType";
 import { RequirementType } from "@spt/models/enums/hideout/RequirementType";
-import { HideoutAreas } from "@spt/models/enums/HideoutAreas";
-import { SkillTypes } from "@spt/models/enums/SkillTypes";
-import { Traders } from "@spt/models/enums/Traders";
 export interface IQteData {
     id: string;
     type: QteActivityType;
diff --git a/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts b/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts
index f1123c12..59713722 100644
--- a/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts
+++ b/types/models/eft/player/IPlayerIncrementSkillLevelRequestData.d.ts
@@ -15,7 +15,5 @@ export interface Items {
     change: any[];
     del: any[];
 }
-export interface Production {
-}
-export interface TraderRelations {
-}
+export type Production = {};
+export type TraderRelations = {};
diff --git a/types/models/eft/profile/ISptProfile.d.ts b/types/models/eft/profile/ISptProfile.d.ts
index a8e742aa..dd7aea6e 100644
--- a/types/models/eft/profile/ISptProfile.d.ts
+++ b/types/models/eft/profile/ISptProfile.d.ts
@@ -209,12 +209,9 @@ export interface Effects {
     LeftLeg: LeftLeg;
     RightLeg: RightLeg;
 }
-export interface Head {
-}
-export interface Chest {
-}
-export interface Stomach {
-}
+export type Head = {};
+export type Chest = {};
+export type Stomach = {};
 export interface LeftArm {
     Fracture?: number;
 }
diff --git a/types/models/eft/ragfair/IRagfairOffer.d.ts b/types/models/eft/ragfair/IRagfairOffer.d.ts
index eeeb79d7..f6c07fcd 100644
--- a/types/models/eft/ragfair/IRagfairOffer.d.ts
+++ b/types/models/eft/ragfair/IRagfairOffer.d.ts
@@ -1,4 +1,5 @@
 import { Item } from "@spt/models/eft/common/tables/IItem";
+import { DogtagExchangeSide } from "@spt/models/enums/DogtagExchangeSide";
 import { MemberCategory } from "@spt/models/enums/MemberCategory";
 export interface IRagfairOffer {
     sellResult?: SellResult[];
@@ -28,6 +29,8 @@ export interface OfferRequirement {
     _tpl: string;
     count: number;
     onlyFunctional: boolean;
+    level?: number;
+    side?: DogtagExchangeSide;
 }
 export interface IRagfairOfferUser {
     id: string;
diff --git a/types/models/eft/ragfair/ISearchRequestData.d.ts b/types/models/eft/ragfair/ISearchRequestData.d.ts
index 8261c5b6..c631de8e 100644
--- a/types/models/eft/ragfair/ISearchRequestData.d.ts
+++ b/types/models/eft/ragfair/ISearchRequestData.d.ts
@@ -29,5 +29,4 @@ export declare enum OfferOwnerType {
     TRADEROWNERTYPE = 1,
     PLAYEROWNERTYPE = 2
 }
-export interface BuildItems {
-}
+export type BuildItems = {};
diff --git a/types/models/enums/BaseClasses.d.ts b/types/models/enums/BaseClasses.d.ts
index 65fc95e6..32ebf7c9 100644
--- a/types/models/enums/BaseClasses.d.ts
+++ b/types/models/enums/BaseClasses.d.ts
@@ -107,6 +107,6 @@ export declare enum BaseClasses {
     RECEIVER = "55818a304bdc2db5418b457d",
     BARREL = "555ef6e44bdc2de9068b457e",
     CHARGING_HANDLE = "55818a6f4bdc2db9688b456b",
-    COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569 ",
+    COMB_MUZZLE_DEVICE = "550aa4dd4bdc2dc9348b4569",
     HIDEOUT_AREA_CONTAINER = "63da6da4784a55176c018dba"
 }
diff --git a/types/models/enums/DogtagExchangeSide.d.ts b/types/models/enums/DogtagExchangeSide.d.ts
new file mode 100644
index 00000000..de3d4df8
--- /dev/null
+++ b/types/models/enums/DogtagExchangeSide.d.ts
@@ -0,0 +1,5 @@
+export declare enum DogtagExchangeSide {
+    USEC = "Usec",
+    BEAR = "Bear",
+    ANY = "Any"
+}
diff --git a/types/models/spt/server/ExhaustableArray.d.ts b/types/models/spt/server/ExhaustableArray.d.ts
index c27f41f6..50a6b687 100644
--- a/types/models/spt/server/ExhaustableArray.d.ts
+++ b/types/models/spt/server/ExhaustableArray.d.ts
@@ -1,5 +1,5 @@
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class ExhaustableArray<T> implements IExhaustableArray<T> {
     private itemPool;
     private randomUtil;
diff --git a/types/routers/EventOutputHolder.d.ts b/types/routers/EventOutputHolder.d.ts
index ef20706b..148461a0 100644
--- a/types/routers/EventOutputHolder.d.ts
+++ b/types/routers/EventOutputHolder.d.ts
@@ -3,8 +3,8 @@ import { IPmcData } from "@spt/models/eft/common/IPmcData";
 import { IHideoutImprovement, Productive, TraderInfo } from "@spt/models/eft/common/tables/IBotBase";
 import { TraderData } from "@spt/models/eft/itemEvent/IItemEventRouterBase";
 import { IItemEventRouterResponse } from "@spt/models/eft/itemEvent/IItemEventRouterResponse";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class EventOutputHolder {
     protected profileHelper: ProfileHelper;
     protected timeUtil: TimeUtil;
@@ -12,7 +12,7 @@ export declare class EventOutputHolder {
     /**
      * What has client been informed of this game session
      * Key = sessionId, then second key is prod id
-    */
+     */
     protected clientActiveSessionStorage: Record<string, Record<string, {
         clientInformed: boolean;
     }>>;
diff --git a/types/servers/HttpServer.d.ts b/types/servers/HttpServer.d.ts
index b00fe684..0024ba38 100644
--- a/types/servers/HttpServer.d.ts
+++ b/types/servers/HttpServer.d.ts
@@ -6,8 +6,8 @@ import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
-import { IHttpListener } from "@spt/servers/http/IHttpListener";
 import { WebSocketServer } from "@spt/servers/WebSocketServer";
+import { IHttpListener } from "@spt/servers/http/IHttpListener";
 import { LocalisationService } from "@spt/services/LocalisationService";
 export declare class HttpServer {
     protected logger: ILogger;
diff --git a/types/servers/WebSocketServer.d.ts b/types/servers/WebSocketServer.d.ts
index f4e07bba..61218247 100644
--- a/types/servers/WebSocketServer.d.ts
+++ b/types/servers/WebSocketServer.d.ts
@@ -1,12 +1,12 @@
 /// <reference types="node" />
 import http, { IncomingMessage } from "node:http";
-import { WebSocket, Server } from "ws";
 import { HttpServerHelper } from "@spt/helpers/HttpServerHelper";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectionHandler";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { JsonUtil } from "@spt/utils/JsonUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { Server, WebSocket } from "ws";
 export declare class WebSocketServer {
     protected logger: ILogger;
     protected randomUtil: RandomUtil;
diff --git a/types/servers/ws/SptWebSocketConnectionHandler.d.ts b/types/servers/ws/SptWebSocketConnectionHandler.d.ts
index 98d0898b..70fc96ad 100644
--- a/types/servers/ws/SptWebSocketConnectionHandler.d.ts
+++ b/types/servers/ws/SptWebSocketConnectionHandler.d.ts
@@ -1,7 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import { IncomingMessage } from "http";
-import { WebSocket } from "ws";
 import { ProfileHelper } from "@spt/helpers/ProfileHelper";
 import { IWsNotificationEvent } from "@spt/models/eft/ws/IWsNotificationEvent";
 import { IHttpConfig } from "@spt/models/spt/config/IHttpConfig";
@@ -11,6 +10,7 @@ import { IWebSocketConnectionHandler } from "@spt/servers/ws/IWebSocketConnectio
 import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { JsonUtil } from "@spt/utils/JsonUtil";
+import { WebSocket } from "ws";
 export declare class SptWebSocketConnectionHandler implements IWebSocketConnectionHandler {
     protected logger: ILogger;
     protected profileHelper: ProfileHelper;
diff --git a/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts b/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts
index d5247ecf..5556129e 100644
--- a/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts
+++ b/types/servers/ws/message/DefaultSptWebSocketMessageHandler.d.ts
@@ -1,6 +1,6 @@
-import { RawData, WebSocket } from "ws";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ISptWebSocketMessageHandler } from "@spt/servers/ws/message/ISptWebSocketMessageHandler";
+import { RawData, WebSocket } from "ws";
 export declare class DefaultSptWebSocketMessageHandler implements ISptWebSocketMessageHandler {
     protected logger: ILogger;
     constructor(logger: ILogger);
diff --git a/types/services/FenceService.d.ts b/types/services/FenceService.d.ts
index c1561225..58dc0765 100644
--- a/types/services/FenceService.d.ts
+++ b/types/services/FenceService.d.ts
@@ -13,9 +13,9 @@ import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 /**
  * Handle actions surrounding Fence
  * e.g. generating or refreshing assorts / get next refresh time
diff --git a/types/services/InsuranceService.d.ts b/types/services/InsuranceService.d.ts
index 0000e660..f7991024 100644
--- a/types/services/InsuranceService.d.ts
+++ b/types/services/InsuranceService.d.ts
@@ -18,10 +18,10 @@ import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocaleService } from "@spt/services/LocaleService";
 import { LocalisationService } from "@spt/services/LocalisationService";
 import { MailSendService } from "@spt/services/MailSendService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { RandomUtil } from "@spt/utils/RandomUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class InsuranceService {
     protected logger: ILogger;
     protected databaseService: DatabaseService;
diff --git a/types/services/LocalisationService.d.ts b/types/services/LocalisationService.d.ts
index 42dfa4e8..855c1386 100644
--- a/types/services/LocalisationService.d.ts
+++ b/types/services/LocalisationService.d.ts
@@ -1,8 +1,8 @@
-import { I18n } from "i18n";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseServer } from "@spt/servers/DatabaseServer";
 import { LocaleService } from "@spt/services/LocaleService";
 import { RandomUtil } from "@spt/utils/RandomUtil";
+import { I18n } from "i18n";
 /**
  * Handles translating server text into different langauges
  */
diff --git a/types/services/ProfileFixerService.d.ts b/types/services/ProfileFixerService.d.ts
index 525b8676..91e47808 100644
--- a/types/services/ProfileFixerService.d.ts
+++ b/types/services/ProfileFixerService.d.ts
@@ -8,7 +8,7 @@ import { Bonus, HideoutSlot } from "@spt/models/eft/common/tables/IBotBase";
 import { IPmcDataRepeatableQuest, IRepeatableQuest } from "@spt/models/eft/common/tables/IRepeatableQuests";
 import { ITemplateItem } from "@spt/models/eft/common/tables/ITemplateItem";
 import { StageBonus } from "@spt/models/eft/hideout/IHideoutArea";
-import { ISptProfile, IEquipmentBuild, IMagazineBuild, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile";
+import { IEquipmentBuild, IMagazineBuild, ISptProfile, IWeaponBuild } from "@spt/models/eft/profile/ISptProfile";
 import { HideoutAreas } from "@spt/models/enums/HideoutAreas";
 import { ICoreConfig } from "@spt/models/spt/config/ICoreConfig";
 import { IRagfairConfig } from "@spt/models/spt/config/IRagfairConfig";
@@ -16,11 +16,11 @@ import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { ConfigServer } from "@spt/servers/ConfigServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { JsonUtil } from "@spt/utils/JsonUtil";
 import { TimeUtil } from "@spt/utils/TimeUtil";
 import { Watermark } from "@spt/utils/Watermark";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class ProfileFixerService {
     protected logger: ILogger;
     protected watermark: Watermark;
@@ -73,6 +73,7 @@ export declare class ProfileFixerService {
      */
     protected removeDanglingTaskConditionCounters(pmcProfile: IPmcData): void;
     protected getActiveRepeatableQuests(repeatableQuests: IPmcDataRepeatableQuest[]): IRepeatableQuest[];
+    protected fixNullRagfairRatings(pmcProfile: IPmcData): void;
     protected fixNullTraderSalesSums(pmcProfile: IPmcData): void;
     protected addMissingBonusesProperty(pmcProfile: IPmcData): void;
     /**
diff --git a/types/services/RagfairOfferService.d.ts b/types/services/RagfairOfferService.d.ts
index 6c13b1d7..98dd1799 100644
--- a/types/services/RagfairOfferService.d.ts
+++ b/types/services/RagfairOfferService.d.ts
@@ -10,10 +10,10 @@ import { ConfigServer } from "@spt/servers/ConfigServer";
 import { SaveServer } from "@spt/servers/SaveServer";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { LocalisationService } from "@spt/services/LocalisationService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HttpResponseUtil } from "@spt/utils/HttpResponseUtil";
 import { RagfairOfferHolder } from "@spt/utils/RagfairOfferHolder";
 import { TimeUtil } from "@spt/utils/TimeUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class RagfairOfferService {
     protected logger: ILogger;
     protected timeUtil: TimeUtil;
diff --git a/types/services/mod/CustomItemService.d.ts b/types/services/mod/CustomItemService.d.ts
index 1926bedf..f112872e 100644
--- a/types/services/mod/CustomItemService.d.ts
+++ b/types/services/mod/CustomItemService.d.ts
@@ -4,8 +4,8 @@ import { CreateItemResult, LocaleDetails, NewItemDetails, NewItemFromCloneDetail
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { DatabaseService } from "@spt/services/DatabaseService";
 import { ItemBaseClassService } from "@spt/services/ItemBaseClassService";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { HashUtil } from "@spt/utils/HashUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 export declare class CustomItemService {
     protected logger: ILogger;
     protected hashUtil: HashUtil;
diff --git a/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts b/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts
index 3c9d9553..91c84d9e 100644
--- a/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts
+++ b/types/services/mod/dynamicRouter/DynamicRouterModService.d.ts
@@ -1,5 +1,5 @@
-import { DependencyContainer } from "tsyringe";
 import { RouteAction } from "@spt/di/Router";
+import { DependencyContainer } from "tsyringe";
 export declare class DynamicRouterModService {
     private container;
     constructor(container: DependencyContainer);
diff --git a/types/services/mod/staticRouter/StaticRouterModService.d.ts b/types/services/mod/staticRouter/StaticRouterModService.d.ts
index f60432da..0c3d4d84 100644
--- a/types/services/mod/staticRouter/StaticRouterModService.d.ts
+++ b/types/services/mod/staticRouter/StaticRouterModService.d.ts
@@ -1,5 +1,5 @@
-import { DependencyContainer } from "tsyringe";
 import { RouteAction } from "@spt/di/Router";
+import { DependencyContainer } from "tsyringe";
 export declare class StaticRouterModService {
     protected container: DependencyContainer;
     constructor(container: DependencyContainer);
diff --git a/types/utils/JsonUtil.d.ts b/types/utils/JsonUtil.d.ts
index b30822c5..44192286 100644
--- a/types/utils/JsonUtil.d.ts
+++ b/types/utils/JsonUtil.d.ts
@@ -1,7 +1,7 @@
-import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
 import { HashUtil } from "@spt/utils/HashUtil";
 import { VFS } from "@spt/utils/VFS";
+import { IParseOptions, IStringifyOptions, Reviver } from "jsonc/lib/interfaces";
 export declare class JsonUtil {
     protected vfs: VFS;
     protected hashUtil: HashUtil;
diff --git a/types/utils/RandomUtil.d.ts b/types/utils/RandomUtil.d.ts
index 49f242d9..0da184f6 100644
--- a/types/utils/RandomUtil.d.ts
+++ b/types/utils/RandomUtil.d.ts
@@ -1,6 +1,6 @@
 import { ILogger } from "@spt/models/spt/utils/ILogger";
-import { ICloner } from "@spt/utils/cloners/ICloner";
 import { MathUtil } from "@spt/utils/MathUtil";
+import { ICloner } from "@spt/utils/cloners/ICloner";
 /**
  * Array of ProbabilityObjectArray which allow to randomly draw of the contained objects
  * based on the relative probability of each of its elements.
diff --git a/types/utils/logging/AbstractWinstonLogger.d.ts b/types/utils/logging/AbstractWinstonLogger.d.ts
index 7098f85e..ef544348 100644
--- a/types/utils/logging/AbstractWinstonLogger.d.ts
+++ b/types/utils/logging/AbstractWinstonLogger.d.ts
@@ -1,12 +1,12 @@
 /// <reference types="node" />
 import fs from "node:fs";
-import winston from "winston";
 import { Daum } from "@spt/models/eft/itemEvent/IItemEventRouterRequest";
 import { LogBackgroundColor } from "@spt/models/spt/logging/LogBackgroundColor";
 import { LogTextColor } from "@spt/models/spt/logging/LogTextColor";
 import { SptLogger } from "@spt/models/spt/logging/SptLogger";
 import { IAsyncQueue } from "@spt/models/spt/utils/IAsyncQueue";
 import { ILogger } from "@spt/models/spt/utils/ILogger";
+import winston from "winston";
 export declare abstract class AbstractWinstonLogger implements ILogger {
     protected asyncQueue: IAsyncQueue;
     protected showDebugInConsole: boolean;