diff --git a/ShadowbaneInquisition/Shadowbane.css b/ShadowbaneInquisition/Shadowbane.css
index 367ecc701c..d65a262742 100644
--- a/ShadowbaneInquisition/Shadowbane.css
+++ b/ShadowbaneInquisition/Shadowbane.css
@@ -138,24 +138,18 @@ ______________________________ start of multipurpose or special-use classes such
 
 .sheet-collapsible_entity_toggle { display: block; }
 .sheet-collapsible_entity_block { display: none; }
-.sheet-collapsible_entity_switch:checked ~ .sheet-collapsible_entity_block,
-.sheet-collapsible_entity_switch_weapon[value='1'] ~ .sheet-collapsible_entity_block { display: block; }
-.sheet-collapsible_entity_switch:checked ~ .sheet-collapsible_entity_toggle,
-.sheet-collapsible_entity_switch_weapon[value='1'] ~ .sheet-collapsible_entity_toggle { display: none; }
+.sheet-collapsible_entity_switch:checked ~ .sheet-collapsible_entity_block { display: block; }
+.sheet-collapsible_entity_switch:checked ~ .sheet-collapsible_entity_toggle { display: none; }
 
 .sheet-collapsible_entity_toggle_half { display: block; }
 .sheet-collapsible_entity_block_half { display: none; }
-.sheet-collapsible_entity_switch_half:checked ~ .sheet-collapsible_entity_block_min,
-.sheet-collapsible_entity_switch_weapon[value='3'] ~ .sheet-collapsible_entity_block_min { display: block; }
-.sheet-collapsible_entity_switch_half:checked ~ .sheet-collapsible_entity_toggle_min,
-.sheet-collapsible_entity_switch_weapon[value='3'] ~ .sheet-collapsible_entity_toggle_min { display: none; }
+.sheet-collapsible_entity_switch_half:checked ~ .sheet-collapsible_entity_block_half { display: block; }
+.sheet-collapsible_entity_switch_half:checked ~ .sheet-collapsible_entity_toggle_half { display: none; }
 
 .sheet-collapsible_entity_toggle_min { display: block; }
 .sheet-collapsible_entity_block_min { display: none; }
-.sheet-collapsible_entity_switch_min:checked ~ .sheet-collapsible_entity_block_half,
-.sheet-collapsible_entity_switch_weapon[value='2'] ~ .sheet-collapsible_entity_block_half { display: block; }
-.sheet-collapsible_entity_switch_min:checked ~ .sheet-collapsible_entity_toggle_half,
-.sheet-collapsible_entity_switch_weapon[value='2'] ~ .sheet-collapsible_entity_toggle_half { display: none; }
+.sheet-collapsible_entity_switch_min:checked ~ .sheet-collapsible_entity_block_min { display: block; }
+.sheet-collapsible_entity_switch_min:checked ~ .sheet-collapsible_entity_toggle_min { display: none; }
 
 .sheet-hidden { display: none; }
 
diff --git a/ShadowbaneInquisition/Shadowbane.html b/ShadowbaneInquisition/Shadowbane.html
index d309a1a4db..c3ad3f9018 100644
--- a/ShadowbaneInquisition/Shadowbane.html
+++ b/ShadowbaneInquisition/Shadowbane.html
@@ -191,7 +191,7 @@
 			</div>
 			<input type='checkbox' name='attr_char_more' class='collapsible_entity_switch hidden' />
 			<div class='collapsible_entity_block'>
-				<label title='Toogle Ignore Fatigue'><input type='checkbox' name='attr_fatigue_ignore' value='1' class='select_button hidden' /><span class='select_text char_more'>Fatigue</span></label>
+				<label title='Toogle Ignore Fatigue'><input type='checkbox' name='attr_fatigue_ignore' value='1' class='select_button hidden' /><span class='select_text char_more'>Fatigue Immunity</span></label>
 				<h3>Characteristics Modifiers</h3>
 				<div class='characteristics_mods'>
 					<input title="Weapon Skill" name='attr_WS_mod' type='text' value='0' class='characteristics_mods full_width' />
@@ -1264,16 +1264,16 @@
 				<!-- TODO: find a way to expand/collapse weapons -->
 				<fieldset name='rangedweapons' class='repeating_rangedweapons'>
 					<div class='equipment_ranged_weapons_rep'>
-						<input name='attr_wep_display' type='checkbox' value='1' class='collapsible_entity_switch hidden' />
-						<input name='attr_wep_display' type='checkbox' value='2' class='collapsible_entity_switch_half hidden' />
-						<input name='attr_wep_display' type='checkbox' value='3' class='collapsible_entity_switch_min hidden' />
+						<input name='attr_wep_display' type='checkbox' value='min' class='collapsible_entity_switch hidden' />
+						<input name='attr_wep_display' type='checkbox' value='half' class='collapsible_entity_switch_min hidden' />
+						<input name='attr_wep_display' type='checkbox' value='expand' class='collapsible_entity_switch_half hidden' />
 						<input type='hidden' name='attr_id' value=''>
 						<input type='hidden' name='attr_ammo' value=''>
 						<div class='equipment_weapon_rep_head'>
 							<div class='equipment_weapon_rep_h1'>
-								<label title='Expand' class='wb1'><input type='checkbox' name='attr_wep_display' value='1' class='select_button hidden' /><span class='select_text'>&#128469;</span></label>
-								<label title='Min'    class='wb2'><input type='checkbox' name='attr_wep_display' value='2' class='select_button hidden' /><span class='select_text'>&#128471;</span></label>
-								<label title='Half'   class='wb3'><input type='checkbox' name='attr_wep_display' value='3' class='select_button hidden' /><span class='select_text'>&#128470;</span></label>
+								<label title='Min'    class='wb1'><input type='checkbox' name='attr_wep_display' value='min' class='select_button hidden' /><span class='select_text'>&#128469;</span></label>
+								<label title='Half'   class='wb2'><input type='checkbox' name='attr_wep_display' value='half' class='select_button hidden' /><span class='select_text'>&#128471;</span></label>
+								<label title='Expand' class='wb3'><input type='checkbox' name='attr_wep_display' value='expand' class='select_button hidden' /><span class='select_text'>&#128470;</span></label>
 							</div>
 							<h3 class='equipment_weapon_rep_h2'><span name='attr_R_weapon_name'></span></h3>
 							<button name='weapon_hit' class='equipment_weapon_rep_h3 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }} {{weapon= @{R_weapon_name}}} {{dos=[[[[1+ floor(abs([[{{ {@{R_weapon_target}+@{inlinemod-toggle}}, {@{bsTotal}-@{limiter}}}kh1, {@{bsTotal}+@{limiter}}}kl1]]-[[1d100@{R_weapon_mishap_chance}]])/10)]]+ceil(@{BS_unnat}/2)]]}}{{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}@{settings_hitroll}{{aim= [[@{R_weapon_aim}]]}}{{R_type= [[@{R_weapon_attack}]]}}{{range= [[@{R_weapon_attack_range}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Ballistic}}{{skill=[[@{BS}]]}}{{advancement= [[@{BS_advancement}]]}}{{weaponmod= [[@{R_weapon_mod1}]]}}{{trained= [[@{R_weapon_trained}]]}}{{burst=@{R_weapon_burst}}}{{auto=@{R_weapon_auto}}}
@@ -1411,8 +1411,10 @@
 								<option value='cs11cs22cs33cs44cs55cs66cs77cs88cs99cs100'>Doubles</option>
 								<option value='cs>?{Mishap chance|96}'>Custom</option>
 							</select>
-							<div class='equipment_ranged_weapons_gs37'>Carry?</div>
-							<input class='equipment_ranged_weapons_gs38' type='checkbox' value='1' name='attr_R_weapon_carry' />
+							<div class='equipment_ranged_weapons_gs37'>Spray?</div>
+							<input class='equipment_ranged_weapons_gs38' type='checkbox' value='spray' name='attr_R_weapon_spray' />
+							<div class='equipment_ranged_weapons_gs39'>Carry?</div>
+							<input class='equipment_ranged_weapons_gs40' type='checkbox' value='1' name='attr_R_weapon_carry' />
 						</div>
 						<div class='collapsible_entity_toggle collapsible_entity_toggle_min collapsible_entity_toggle_half'>
 							<input name='attr_R_ability_r' type='text' placeholder='Special' class='full_width_49px border_none' />
@@ -1429,14 +1431,14 @@
 				<h3 class='radius_border_top'>Melee Weapons</h3>
 				<fieldset name='meleeweapons' class='repeating_meleeweapons'>
 					<div class='equipment_melee_weapons_rep'>
-						<input name='attr_wep_display' type='checkbox' value='1' class='collapsible_entity_switch hidden' />
-						<input name='attr_wep_display' type='checkbox' value='2' class='collapsible_entity_switch_half hidden' />
-						<input name='attr_wep_display' type='checkbox' value='3' class='collapsible_entity_switch_min hidden' />
+						<input name='attr_wep_display' type='checkbox' value='min' class='collapsible_entity_switch hidden' />
+						<input name='attr_wep_display' type='checkbox' value='half' class='collapsible_entity_switch_min hidden' />
+						<input name='attr_wep_display' type='checkbox' value='expand' class='collapsible_entity_switch_half hidden' />
 						<div class='equipment_weapon_rep_head'>
 							<div class='equipment_weapon_rep_h1'>
-								<label title='Expand' class='wb1'><input type='checkbox' name='attr_wep_display' value='1' class='select_button hidden' /><span class='select_text'>&#128469;</span></label>
-								<label title='Min'    class='wb2'><input type='checkbox' name='attr_wep_display' value='2' class='select_button hidden' /><span class='select_text'>&#128471;</span></label>
-								<label title='Half'   class='wb3'><input type='checkbox' name='attr_wep_display' value='3' class='select_button hidden' /><span class='select_text'>&#128470;</span></label>
+								<label title='Min'    class='wb1'><input type='checkbox' name='attr_wep_display' value='min' class='select_button hidden' /><span class='select_text'>&#128469;</span></label>
+								<label title='Half'   class='wb2'><input type='checkbox' name='attr_wep_display' value='half' class='select_button hidden' /><span class='select_text'>&#128471;</span></label>
+								<label title='Expand' class='wb3'><input type='checkbox' name='attr_wep_display' value='expand' class='select_button hidden' /><span class='select_text'>&#128470;</span></label>
 							</div>
 							<h3 class='equipment_weapon_rep_h2'><span name='attr_M_weapon_name'></span></h3>
 							<button name='weapon_hit' class='equipment_weapon_rep_h3 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{M_weapon_name}}}{{dos=[[[[1+ floor(abs([[{{ {@{M_weapon_target}+@{inlinemod-toggle}}, {@{wsTotal}-@{limiter}}}kh1, {@{wsTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{WS_unnat}/2)]]}}{{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}@{settings_hitroll} {{aim= [[@{M_weapon_aim}]]}}{{M_type= [[@{M_weapon_attack}]]}}{{multi= [[@{M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Weapon}}{{skill=[[@{WS}]]}}{{advancement=[[@{WS_advancement}]]}}{{weaponmod=[[@{M_weapon_mod1}]]}}{{trained=[[@{M_weapon_trained}]]}}{{WS_bonus=[[@{wsB}]]}}'>Hit
@@ -1967,16 +1969,16 @@
 					<h3 class='radius_border_top'>Vehicle Ranged Weapons</h3>
 					<fieldset name='vehiclerangedweapons' class='repeating_vehiclerangedweapons'>
 						<div class='equipment_ranged_weapons_rep'>
-							<input name='attr_wep_display' type='checkbox' value='1' class='collapsible_entity_switch hidden' />
-							<input name='attr_wep_display' type='checkbox' value='2' class='collapsible_entity_switch_half hidden' />
-							<input name='attr_wep_display' type='checkbox' value='3' class='collapsible_entity_switch_min hidden' />
+							<input name='attr_wep_display' type='checkbox' value='min' class='collapsible_entity_switch hidden' />
+							<input name='attr_wep_display' type='checkbox' value='half' class='collapsible_entity_switch_min hidden' />
+							<input name='attr_wep_display' type='checkbox' value='expand' class='collapsible_entity_switch_half hidden' />
 							<input type='hidden' name='attr_id' value=''>
 							<input type='hidden' name='attr_ammo' value=''>
 							<div class='equipment_weapon_rep_head'>
 								<div class='equipment_weapon_rep_h1'>
-									<label title='Expand' class='wb1'><input type='checkbox' name='attr_wep_display' value='1' class='select_button hidden' /><span class='select_text'>&#128469;</span></label>
-									<label title='Min'    class='wb2'><input type='checkbox' name='attr_wep_display' value='2' class='select_button hidden' /><span class='select_text'>&#128471;</span></label>
-									<label title='Half'   class='wb3'><input type='checkbox' name='attr_wep_display' value='3' class='select_button hidden' /><span class='select_text'>&#128470;</span></label>
+									<label title='Min'    class='wb1'><input type='checkbox' name='attr_wep_display' value='min' class='select_button hidden' /><span class='select_text'>&#128469;</span></label>
+									<label title='Half'   class='wb2'><input type='checkbox' name='attr_wep_display' value='half' class='select_button hidden' /><span class='select_text'>&#128471;</span></label>
+									<label title='Expand' class='wb3'><input type='checkbox' name='attr_wep_display' value='expand' class='select_button hidden' /><span class='select_text'>&#128470;</span></label>
 								</div>
 								<h3 class='equipment_weapon_rep_h2'><span name='attr_V_R_weapon_name'></span></h3>
 								<button name='weapon_hit' class='equipment_weapon_rep_h3 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }} {{weapon= @{V_R_weapon_name}}} {{dos=[[[[1+ floor(abs([[{{ {@{V_R_weapon_target}+@{inlinemod-toggle}}, {@{bsTotal}-@{limiter}}}kh1, {@{bsTotal}+@{limiter}}}kl1]]-[[1d100@{V_R_weapon_mishap_chance}]])/10)]]+ceil(@{BS_unnat}/2)]]}}{{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}@{settings_hitroll}{{aim= [[@{V_R_weapon_aim}]]}}{{V_R_type= [[@{V_R_weapon_attack}]]}}{{range= [[@{V_R_weapon_attack_range}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Ballistic}}{{skill=[[@{BS}]]}}{{advancement= [[@{BS_advancement}]]}}{{weaponmod= [[@{V_R_weapon_mod1}]]}}{{trained= [[@{V_R_weapon_trained}]]}}{{burst=@{V_R_weapon_burst}}}{{auto=@{V_R_weapon_auto}}}
@@ -2114,6 +2116,8 @@
 									<option value='cs11cs22cs33cs44cs55cs66cs77cs88cs99cs100'>Doubles</option>
 									<option value='cs>?{Mishap chance|96}'>Custom</option>
 								</select>
+							<div class='equipment_ranged_weapons_gs37'>Spray?</div>
+							<input class='equipment_ranged_weapons_gs38' type='checkbox' value='spray' name='attr_V_R_weapon_spray' />
 							</div>
 							<div class='collapsible_entity_toggle collapsible_entity_toggle_min collapsible_entity_toggle_half'>
 								<input name='attr_V_R_ability_r' type='text' placeholder='Special' class='full_width_49px border_none' />
@@ -2129,15 +2133,15 @@
 					<h3 class='radius_border_top'>Vehicle Melee Weaponry</h3>
 					<fieldset name='vehiclemeleeweapons' class='repeating_vehiclemeleeweapons'>
 					  <div class='equipment_melee_weapons_rep'>
-					    <input name='attr_wep_display' type='checkbox' value='1' class='collapsible_entity_switch hidden' />
-					    <input name='attr_wep_display' type='checkbox' value='2' class='collapsible_entity_switch_half hidden' />
-					    <input name='attr_wep_display' type='checkbox' value='3' class='collapsible_entity_switch_min hidden' />
-					    <div class='equipment_weapon_rep_head'>
-					      <div class='equipment_weapon_rep_h1'>
-					        <label title='Expand' class='wb1'><input type='checkbox' name='attr_wep_display' value='1' class='select_button hidden' /><span class='select_text'>&#128469;</span></label>
-					        <label title='Min'    class='wb2'><input type='checkbox' name='attr_wep_display' value='2' class='select_button hidden' /><span class='select_text'>&#128471;</span></label>
-					        <label title='Half'   class='wb3'><input type='checkbox' name='attr_wep_display' value='3' class='select_button hidden' /><span class='select_text'>&#128470;</span></label>
-					      </div>
+							<input name='attr_wep_display' type='checkbox' value='min' class='collapsible_entity_switch hidden' />
+							<input name='attr_wep_display' type='checkbox' value='half' class='collapsible_entity_switch_min hidden' />
+							<input name='attr_wep_display' type='checkbox' value='expand' class='collapsible_entity_switch_half hidden' />
+							<div class='equipment_weapon_rep_head'>
+								<div class='equipment_weapon_rep_h1'>
+									<label title='Min'    class='wb1'><input type='checkbox' name='attr_wep_display' value='min' class='select_button hidden' /><span class='select_text'>&#128469;</span></label>
+									<label title='Half'   class='wb2'><input type='checkbox' name='attr_wep_display' value='half' class='select_button hidden' /><span class='select_text'>&#128471;</span></label>
+									<label title='Expand' class='wb3'><input type='checkbox' name='attr_wep_display' value='expand' class='select_button hidden' /><span class='select_text'>&#128470;</span></label>
+								</div>
 					      <h3 class='equipment_weapon_rep_h2'><span name='attr_V_M_weapon_name'></span></h3>
 					      <button name='weapon_hit' class='equipment_weapon_rep_h3 full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}} {{attack= }}{{weapon= @{V_M_weapon_name}}}{{dos=[[[[1+ floor(abs([[{{ {@{V_M_weapon_target}+@{inlinemod-toggle}}, {@{wsTotal}-@{limiter}}}kh1, {@{wsTotal}+@{limiter}}}kl1]]-[[1d100]])/10)]]+ceil(@{WS_unnat}/2)]]}}{{target= $[[0]]}}{{roll= $[[1]]}}{{dof= $[[2]]}}@{settings_hitroll} {{aim= [[@{V_M_weapon_aim}]]}}{{V_M_type= [[@{V_M_weapon_attack}]]}}{{multi= [[@{V_M_weapon_multi}]]}}{{modifier= [[@{inlinemod-toggle}]]}}{{skill_name= Weapon}}{{skill=[[@{WS}]]}}{{advancement=[[@{WS_advancement}]]}}{{weaponmod=[[@{V_M_weapon_mod1}]]}}{{trained=[[@{V_M_weapon_trained}]]}}{{WS_bonus=[[@{wsB}]]}}'>Hit
 					        |<input name='attr_V_M_weapon_target' value='@{wsTotal}+@{V_M_weapon_trained}-20+@{V_M_weapon_mod1}+@{V_M_weapon_attack}+@{V_M_weapon_aim}+@{V_M_weapon_multi}' class='input_background input_char_background' disabled ></button>
@@ -2322,14 +2326,14 @@
 				<h3 class='radius_border_top'>Psychic Abilities</h3>
 				<fieldset name='psychicabilities' class='repeating_psychicabilities'>
 					<div class='psykana_ability_rep'>
-						<input name='attr_wep_display' type='checkbox' value='1' class='collapsible_entity_switch hidden' />
-						<input name='attr_wep_display' type='checkbox' value='2' class='collapsible_entity_switch_half hidden' />
-						<input name='attr_wep_display' type='checkbox' value='3' class='collapsible_entity_switch_min hidden' />
+						<input name='attr_wep_display' type='checkbox' value='min' class='collapsible_entity_switch hidden' />
+						<input name='attr_wep_display' type='checkbox' value='half' class='collapsible_entity_switch_min hidden' />
+						<input name='attr_wep_display' type='checkbox' value='expand' class='collapsible_entity_switch_half hidden' />
 						<div class='equipment_weapon_rep_head'>
 							<div class='equipment_weapon_rep_h1'>
-								<label title='Expand' class='wb1'><input type='checkbox' name='attr_wep_display' value='1' class='select_button hidden' /><span class='select_text'>&#128469;</span></label>
-								<label title='Min'    class='wb2'><input type='checkbox' name='attr_wep_display' value='2' class='select_button hidden' /><span class='select_text'>&#128471;</span></label>
-								<label title='Half'   class='wb3'><input type='checkbox' name='attr_wep_display' value='3' class='select_button hidden' /><span class='select_text'>&#128470;</span></label>
+								<label title='Min'    class='wb1'><input type='checkbox' name='attr_wep_display' value='min' class='select_button hidden' /><span class='select_text'>&#128469;</span></label>
+								<label title='Half'   class='wb2'><input type='checkbox' name='attr_wep_display' value='half' class='select_button hidden' /><span class='select_text'>&#128471;</span></label>
+								<label title='Expand' class='wb3'><input type='checkbox' name='attr_wep_display' value='expand' class='select_button hidden' /><span class='select_text'>&#128470;</span></label>
 							</div>
 							<h3 class='equipment_weapon_rep_h2'><span name='attr_P_name'></span></h3>
 							<button name='psy_hit' class='equipment_weapon_rep_h3_psy full_width clear' type='roll' value='@{to-gm}&{template:mythic} {{character= @{character_name}}}{{psy= }}{{attack= }}{{weapon= @{P_name}}}{{dos=[[[[1+floor(abs([[{{ {@{P_total}+@{inlinemod-toggle}}, {@{P_focus}-@{limiter}}}kh1, {@{P_focus}+@{limiter}}}kl1]]-[[1d100@{psy_roll}]])/10)]]+ceil(@{WP_unnat}/2)]]}}{{target=$[[0]]}}{{roll=$[[1]]}}{{dof=$[[2]]}}@{P_hitloc} {{class=[[@{psykana_class}]]}}{{limit=[[@{psykana_limit}]]}}{{focus=[[@{P_focus}]]}}{{pmod=[[@{P_mod1}]]}}{{focus_mod=[[@{focus_mod}]]}}{{sustain=[[@{psykana_sustain}]]}}{{modifier=[[@{inlinemod-toggle}]]}}{{P_multi=[[@{P_multi}]]}}{{epr=[[@{effective_psy_rating}]]}}
@@ -3661,7 +3665,7 @@ NOTE: replace worker by javascript for IDE functionality
 				`repeating_vehiclerangedweapons_${id}_V_R_weapon_vengeful`,
 				`repeating_vehiclerangedweapons_${id}_V_R_weapon_min`,
 				`repeating_vehiclerangedweapons_${id}_V_R_weapon_max`,
-				`repeating_rangedweapons_${id}_V_R_weapon_setting`
+				`repeating_vehiclerangedweapons_${id}_V_R_weapon_setting`
 				);
 			});
 			calcDmg(sources, fieldnames);