diff --git a/HackMaster_4E/hm4e.html b/HackMaster_4E/hm4e.html
index 1f3552639b..93c5ed8e4a 100644
--- a/HackMaster_4E/hm4e.html
+++ b/HackMaster_4E/hm4e.html
@@ -535,7 +535,7 @@
 						<option value="Padded">Padded</option>
 						<option value="Stud.Leather">Stud.Leather</option>
 						<option value="Ring Mail">Ring Mail</option>
-						<option value="Tinker's Armor">Tinker's Armor</option>
+						<option value="Tinker Armor">Tinker's Armor</option>
 						<option value="Hide">Hide</option>
 						<option value="Brigandine">Brigandine</option>
 						<option value="Scale Mail">Scale Mail</option>
@@ -732,7 +732,7 @@
 							<hr/>
 							<div><br/>
 								<button type="roll" name="roll_tohitms" title="Hit" style="width: 40px" class="btn ui-draggable"
-									value="&{template:combat} {{tohit=[[[[1d20]]@{honor_bonus} @{dex_missile_adjust}+ (@{msplushit})+(?{Range|Short, [[0]]|Medium, [[-2]]|Long, [[-5]]})]]}} {{raw_roll=$[[0]]}} {{statname=Dex Bonus}} {{statplus=@{dex_missile_adjust}}} {{weaponname=@{msweaponname}}} {{honor=@{honor_bonus}}} {{mods=?{Range}}} {{character=@{character_name}}} {{bonus=@{msplushit}}} }}">
+									value="&{template:combat} {{tohit=[[[[1d20]]@{honor_bonus} +@{dex_missile_adjust}+ (@{msplushit})+(?{Range|Short, [[0]]|Medium, [[-2]]|Long, [[-5]]})]]}} {{raw_roll=$[[0]]}} {{statname=Dex Bonus}} {{statplus=@{dex_missile_adjust}}} {{weaponname=@{msweaponname}}} {{honor=@{honor_bonus}}} {{mods=?{Range}}} {{character=@{character_name}}} {{bonus=@{msplushit}}} }}">
 									Hit</button>
 							</div>
 						</div>
@@ -2773,30 +2773,32 @@
 
    const getArmorInfo = (armorName) => {
     let armortable = [
-        {key:"None","AC": 10, "HP": [0,0,0,0,0,0,0,0,0], "PP": 5, "OL": 0, "FRT": 0, "MS": 10, "HIS": 5, "DN": 0, "CW": 10, "SF": 0}, 
-        {key:"Heavy Cloth","AC": 9, "HP": [1,0,0,0,0,0,0,0,0], "PP": 5, "OL": 0, "FRT": 0, "MS": 10, "HIS": 5, "DN": 0, "CW": 10, "SF": 0}, 
-        {key:"Leather","AC": 8, "HP": [2,1,0,0,0,0,0,0,0], "PP": 5, "OL": 0, "FRT": 0, "MS": 10, "HIS": 5, "DN": 0, "CW": 10, "SF": 25}, 
-        {key:"Padded","AC": 8, "HP": [2,1,0,0,0,0,0,0,0], "PP": -25, "OL": -10, "FRT": -10, "MS": -15, "HIS": -15, "DN": -5, "CW": -25, "SF": 20}, 
-        {key:"Stud.Leather","AC": 7, "HP": [4,2,1,0,0,0,0,0,0], "PP": -25, "OL": -10, "FRT": -10, "MS": -15, "HIS": -15, "DN": -5, "CW": -25, "SF": 30}, 
-        {key:"Ring Mail","AC": 7, "HP": [6,2,1,0,0,0,0,0,0], "PP": -25, "OL": -10, "FRT": -10, "MS": -15, "HIS": -15, "DN": -5, "CW": -25, "SF": 40}, 
-        {key:"Tinker's Armor ","AC ": 7, "HP ": [4,2,1,0,0,0,0,0,0], "PP ": -25, "OL ": -10, "FRT ": -10, "MS ": -15, "HIS ": -15, "DN ": -5, "CW ": -25, "SF ": 25}, 
-        {key:"Hide","AC ": 6, "HP ": [5,4,2,1,0,0,0,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 40}, 
-        {key:"Brigandine","AC ": 6, "HP ": [6,4,2,1,0,0,0,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 35}, 
-        {key:"Scale Mail","AC ": 6, "HP ": [7,4,2,1,0,0,0,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 35}, 
-        {key:"Chain Shirt","AC ": 6, "HP ": [6,4,2,1,0,0,0,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 40}, 
-        {key:"Chain Mail","AC ": 5, "HP ": [8,6,4,2,1,0,0,0,0], "PP ": -25, "OL ": -10, "FRT ": -10, "MS ": -15, "HIS ": -15, "DN ": -10, "CW ": -25, "SF ": 50}, 
-        {key:"Stud. Hide","AC ": 5, "HP ": [7,6,4,2,1,0,0,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 45}, 
-        {key:"Splint Mail","AC ": 4, "HP ": [8,8,6,4,2,1,0,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 60}, 
-        {key:"Heavy Chain","AC ": 4, "HP ": [9,8,6,4,2,1,0,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 60}, 
-        {key:"Banded Mail","AC ": 4, "HP ": [9,8,6,4,2,1,0,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 80}, 
-        {key:"Plate Mail","AC ": 3, "HP ": [12,10,8,6,4,2,1,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 100}, 
-        {key:"Bronze Plate Mail","AC ": 4, "HP ": [12,10,8,6,4,2,1,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 100}, 
-        {key:"Half-Plate","AC ": 3, "HP ": [18,12,10,8,4,2,1,0,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 110}, 
-        {key:"Field Plate","AC ": 2, "HP ": [24,12,10,8,6,4,2,1,0], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 120}, 
-        {key:"Full Plate","AC ": 1, "HP ": [36,24,12,10,8,6,4,2,1], "PP ": -999, "OL ": -999, "FRT ": -999, "MS ": -999, "HIS ": -999, "DN ": -999, "CW ": -999, "SF ": 150}, 
-        {key:"Elven Chain","AC ": 5, "HP ": [8,6,4,2,1,0,0,0,0], "PP ": -20, "OL ": -5, "FRT ": -5, "MS ": -10, "HIS ": -10, "DN ": -5, "CW ": -20, "SF ": 20}
+		{key:"Brigandine","AC": 6,"HP": [6,4,2,1,0,0,0,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 35},
+        {key:"None","AC": 10,"HP": [0,0,0,0,0,0,0,0,0],"PP": 5,"OL": 0,"FRT": 0,"MS": 10,"HIS": 5,"DN": 0,"CW": 10,"SF": 0}, 
+        {key:"Heavy Cloth","AC": 9,"HP": [1,0,0,0,0,0,0,0,0],"PP": 5,"OL": 0,"FRT": 0,"MS": 10,"HIS": 5,"DN": 0,"CW": 10,"SF": 0}, 
+        {key:"Leather","AC": 8,"HP": [2,1,0,0,0,0,0,0,0],"PP": 5,"OL": 0,"FRT": 0,"MS": 10,"HIS": 5,"DN": 0,"CW": 10,"SF": 25}, 
+        {key:"Padded","AC": 8,"HP": [2,1,0,0,0,0,0,0,0],"PP": -25,"OL": -10,"FRT": -10,"MS": -15,"HIS": -15,"DN": -5,"CW": -25,"SF": 20}, 
+        {key:"Stud.Leather","AC": 7,"HP": [4,2,1,0,0,0,0,0,0],"PP": -25,"OL": -10,"FRT": -10,"MS": -15,"HIS": -15,"DN": -5,"CW": -25,"SF": 30}, 
+        {key:"Ring Mail","AC": 7,"HP": [6,2,1,0,0,0,0,0,0],"PP": -25,"OL": -10,"FRT": -10,"MS": -15,"HIS": -15,"DN": -5,"CW": -25,"SF": 40}, 
+        {key:"Tinker Armor","AC": 7,"HP": [4,2,1,0,0,0,0,0,0],"PP": -25,"OL": -10,"FRT": -10,"MS": -15,"HIS": -15,"DN": -5,"CW": -25,"SF": 25}, 
+        {key:"Hide","AC": 6,"HP": [5,4,2,1,0,0,0,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 40}, 
+         
+        {key:"Scale Mail","AC": 6,"HP": [7,4,2,1,0,0,0,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 35}, 
+        {key:"Chain Shirt","AC": 6,"HP": [6,4,2,1,0,0,0,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 40}, 
+        {key:"Chain Mail","AC": 5,"HP": [8,6,4,2,1,0,0,0,0],"PP": -25,"OL": -10,"FRT": -10,"MS": -15,"HIS": -15,"DN": -10,"CW": -25,"SF": 50}, 
+        {key:"Stud. Hide","AC": 5,"HP": [7,6,4,2,1,0,0,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 45}, 
+        {key:"Splint Mail","AC": 4,"HP": [8,8,6,4,2,1,0,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 60}, 
+        {key:"Heavy Chain","AC": 4,"HP": [9,8,6,4,2,1,0,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 60}, 
+        {key:"Banded Mail","AC": 4,"HP": [9,8,6,4,2,1,0,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 80}, 
+        {key:"Plate Mail","AC": 3,"HP": [12,10,8,6,4,2,1,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 100}, 
+        {key:"Bronze Plate Mail","AC": 4,"HP": [12,10,8,6,4,2,1,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 100}, 
+        {key:"Half-Plate","AC": 3,"HP": [18,12,10,8,4,2,1,0,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 110}, 
+        {key:"Field Plate","AC": 2,"HP": [24,12,10,8,6,4,2,1,0],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 120}, 
+        {key:"Full Plate","AC": 1,"HP": [36,24,12,10,8,6,4,2,1],"PP": -999,"OL": -999,"FRT": -999,"MS": -999,"HIS": -999,"DN": -999,"CW": -999,"SF": 150}, 
+        {key:"Elven Chain","AC": 5,"HP": [8,6,4,2,1,0,0,0,0],"PP": -20,"OL": -5,"FRT": -5,"MS": -10,"HIS": -10,"DN": -5,"CW": -20,"SF": 20}
         ] ;
         var armor = armortable.find (i => i.key == armorName) ;
+		//console.log(armor);
         return armor;
    }
    const getShieldInfo = (shieldName) => {