diff --git a/gamedir/Data-1.13/Ja2_Options.INI b/gamedir/Data-1.13/Ja2_Options.INI
index 42792d7b9..f557be642 100644
--- a/gamedir/Data-1.13/Ja2_Options.INI
+++ b/gamedir/Data-1.13/Ja2_Options.INI
@@ -628,6 +628,7 @@ SMALL_SIZE_PB = FALSE
 ; 0   = no change
 ; 100 = max volume
 ;------------------------------------------------------------------------------------------------------------------------------
+
 WEAPON_SOUND_EFFECTS_VOLUME = 0
 
 ;------------------------------------------------------------------------------------------------------------------------------
@@ -921,6 +922,16 @@ ALLOW_EXPLOSIVE_ATTACHMENTS = FALSE
 
 ALLOW_SPECIAL_EXPLOSIVE_ATTACHMENTS = FALSE
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Default: FALSE 
+; Allow merc to automatically take mine with same id from inventory after using one
+; If no item found, then first available mine will be taken from inventory
+; For this feature to work, SHIFT key must be pressed while planting mine
+; Also, this allows to plant tripwire with previously selected network type and hierarchy (with SHIFT key pressed)
+;------------------------------------------------------------------------------------------------------------------------------
+
+IMPROVED_BOMB_PLANTING = FALSE
+
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Default: 100 
 ; Chance to say annoying phrase.
diff --git a/gamedir/Data/Ja2_Options.INI b/gamedir/Data/Ja2_Options.INI
index 9cb862a67..bd2dd1d9f 100644
--- a/gamedir/Data/Ja2_Options.INI
+++ b/gamedir/Data/Ja2_Options.INI
@@ -853,9 +853,12 @@ ALT_AIMING_ENABLED = FALSE
 ; Due to the reworked auto and burst penalties aimed auto-fire is less efficient then aimed burst for all guns. There is simply
 ; no use in firing more then 3 rounds due to low CtH od the last bullets. Aiming is performed by the mouse scrolling wheel. 
 ; ENABLE_EXT_MOUSE_KEYS must be set to TRUE for this option.
+;
+; If your mousewheel does not work, you can do the same via [o] if AIMED_BURST_ALTERNATE_KEY is TRUE.
 ;------------------------------------------------------------------------------------------------------------------------------
 
 USE_AIMED_BURST = FALSE
+AIMED_BURST_ALTERNATE_KEY = FALSE
 
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Default: 2
@@ -887,6 +890,46 @@ ALLOW_WEAR_SUPPRESSOR = FALSE
 
 ALLOW_LAZY_CIVILIANS  = FALSE
 
+;------------------------------------------------------------------------------------------------------------------------------
+; Default: FALSE 
+; Neutral civilians can detect and avoid mines planted by player
+;------------------------------------------------------------------------------------------------------------------------------
+
+CIVILIANS_AVOID_PLAYER_MINES = TRUE
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Default: FALSE 
+; Add small smoke after explosion (only outdoor, not underground, only regular type explosion)
+;------------------------------------------------------------------------------------------------------------------------------
+
+ADD_SMOKE_AFTER_EXPLOSION = FALSE
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Default: FALSE 
+; Added attachments explode if they have usItemClass 256 or 512 (grenade or explosive), have ubVolatility>0 and
+; one of attachments is rubber band or duct tape
+;------------------------------------------------------------------------------------------------------------------------------
+
+ALLOW_EXPLOSIVE_ATTACHMENTS = FALSE
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Default: FALSE 
+; Allow special explosive attachments (items with tags <GasCan>, <Marbles> and <Alcohol> add special explosion effects)
+; one of attachments must be rubber band or duct tape
+;------------------------------------------------------------------------------------------------------------------------------
+
+ALLOW_SPECIAL_EXPLOSIVE_ATTACHMENTS = FALSE
+
+;------------------------------------------------------------------------------------------------------------------------------
+; Default: FALSE 
+; Allow merc to automatically take mine with same id from inventory after using one
+; If no item found, then first available mine will be taken from inventory
+; For this feature to work, SHIFT key must be pressed while planting mine
+; Also, this allows to plant tripwire with previously selected network type and hierarchy (with SHIFT key pressed)
+;------------------------------------------------------------------------------------------------------------------------------
+
+IMPROVED_BOMB_PLANTING = FALSE
+
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Default: 100 
 ; Chance to say annoying phrase.
@@ -1705,6 +1748,16 @@ SOLDIER_PROFILES_MILITIA = FALSE
 
 CAMO_REMOVING = FALSE
 
+;------------------------------------------------------------------------------------------------------------------------------
+; This setting defines the percentage area of a characters body that can be painted with camo kits. Usually only the face and hands
+; can be painted with camo. The rest of the body has to be camouflaged by clothing and armor which are already colored.
+; Setting this to 0 means camo kits are useless. At 100 camo kits can paint the whole body but cloth camo is useless.
+; Valid values are from 0 to 100.
+; default is 5
+;------------------------------------------------------------------------------------------------------------------------------
+
+CAMO_KIT_USABLE_AREA = 5
+
 ;------------------------------------------------------------------------------------------------------------------------------
 ; Enhanced Close Combat System
 ; 
@@ -2115,15 +2168,15 @@ OVERHEATING = FALSE
 ; Should a 'thermometer' for guns and replacable barrels be displayed?
 OVERHEATING_DISPLAY_THERMOMETER = FALSE
 
+; Should we display temperature/jam threshold (TRUE) or temperature/damage threshold (FALSE)?
+OVERHEATING_DISPLAY_JAMPERCENTAGE = TRUE
+
 ; Starting amount of red colour in the temperature bar. Must be in [0, 255]
 OVERHEATING_DISPLAY_THERMOMETER_RED_OFFSET = 100
 
 ; If a barrel is not in someone's inventory, it cools down a little bit better.
 OVERHEATING_COOLDOWN_MODIFICATOR_LONELYBARREL = 1.15
 
-; with this value one can increase or lower the temperature generated by all guns. Values from 0.1 to 10.0
-OVERHEATING_TEMPERATURE_GLOBAL_MODIFIER = 1.0
-
 ;******************************************************************************************************************************
 ;******************************************************************************************************************************
 
@@ -2609,7 +2662,7 @@ ADDITIONAL_REPAIR_MODE = FALSE
 ; advanced repair/dirt system
 ;------------------------------------------------------------------------------------------------------------------------------
 
-; determines wether a gun can suffer permanent damage that cannot be repaired other by local smiths.
+; determines wether a gun can suffer permanent damage that cannot be repaired by anyone other than local smiths.
 ADVANCED_REPAIR = FALSE
 
 ; the only items we can repair are guns and armour
@@ -2624,7 +2677,7 @@ DIRT_SYSTEM = FALSE
 ; repairing a gun to its currently possible maximum value also cleans the gun (always so on repair shopkeepers)
 FULL_REPAIR_CLEANS_GUN = FALSE
 
-; every trun, a gun suffers a dirt increase equal to a singleshot dirt increase divided by this number
+; every turn, a gun suffers a dirt increase equal to a singleshot dirt increase divided by this number
 SECTOR_DIRT_DIVIDER = 1000
 
 ; with this value one can increase or lower the dirt generated by all guns. Values from 0.1 to 10.0
@@ -2636,6 +2689,7 @@ DIRT_GLOBAL_MODIFIER = 1.25
 ; 0 = Don't allow Skyrider to drop off mercs in hot LZ (Vanilla style)
 ; 1 = Allow Skyrider to drop off mercs to center of map
 ; 2 = Skyrider drops mercs at map edge from direction he entered the sector.
+; 3 = Allow Skyrider to drop your mercs as a group at a location of your choosing
 ;******************************************************************************************************************************
 
 ALLOW_SKYRIDER_HOT_LZ = 2
@@ -2686,7 +2740,7 @@ PLAYER_CAN_ASK_TO_SURRENDER = TRUE
 ; chance that released soldiers join the army again
 PRISONER_RETURN_TO_ARMY_CHANCE = 50
 
-; chance that interrogated soldiers decide to join your cause (they will be turned into militia)
+; chance that interrogated soldiers decide to join your cause (they will be turned into militia of same or lower quality)
 PRISONER_DEFECT_CHANCE = 25
 
 ; chance that interrogated soldiers can give info on enemy positions
@@ -2703,7 +2757,7 @@ PRISONER_RANSOM_CHANCE = 25
 
 ; points needed to interrogate prisoners of specific types. You can see your points on the merc's face in strategic: 145/7 means 145 points, 7 prisoners
 ; Interrogation first removes admin prisoners, then regulars and then elites
-; If regulars and elites join your militia, there is a chance that they will be ddmoted, otherwise they will join as regular or veteran militia
+; If regulars and elites join your militia, there is a chance that they will be demoted, otherwise they will join as regular or veteran militia
 ; special prisoners do not exist... yet.
 PRISONER_INTERROGATION_POINTS_ADMIN     =  80
 PRISONER_INTERROGATION_POINTS_REGULAR   = 100
@@ -3270,9 +3324,9 @@ ALLOW_MOBILE_MILITIA_REINFORCE_TOWN_GARRISONS = FALSE
 ALLOW_MOBILE_MILITIA_REINFORCE_SAM_GARRISONS = FALSE
 
 ;------------------------------------------------------------------------------------------------------------------------------
-; This setting controls whether militia will follow the player on map in non combat situation.
+; This setting controls wether militia will follow the player on map in non combat situation.
 ; If set to TRUE they will more likely move to a sector where a player merc is or is about to arrive and also stay there 
-; (default HAM behaviour).
+; (default behaviour). This overwrites any manual restrictions.
 ; Set to FALSE if they dont worry about the player.
 ;------------------------------------------------------------------------------------------------------------------------------