diff --git a/Beacon/beacon.html b/Beacon/beacon.html
index 9ef20dabff..308dd8dc92 100644
--- a/Beacon/beacon.html
+++ b/Beacon/beacon.html
@@ -652,10 +652,10 @@
 								<option value="2">
 									Melee 1-handed
 								</option>
-								<option value="4">
+								<option value="1">
 									Melee 2-handed
 								</option>
-								<option value="0">
+								<option value="-1">
 									Ranged
 								</option>
 							</select> 
@@ -678,7 +678,7 @@
 							</td>
 							<td>
 								<button type="roll" value=
-								"&{template:default} {{name=Dual Wield Roll}} {{@{weapon_name}=[[d20+@{strength_bonus} + @{attack_bonus} + @{weapon_mod}-2]]}}" title="d20 + strength bonus + attack bonus + miscellaneous weapon modifier - attack penalty">
+								"&{template:default} {{name=Dual Wield Roll}} {{@{weapon_name}=[[d20+@{strength_bonus})) + @{attack_bonus} + @{weapon_mod}-2]]}}" title="d20 + strength bonus + attack bonus + miscellaneous weapon modifier - attack penalty">
 								</button>
 							</td>
 						</tr>
@@ -689,7 +689,7 @@
 							</td>
 							<td>
 								<button type="roll" value=
-								"&{template:default} {{name=Dual Wield Roll}} {{@{weapon_name}=[[d20+@{dexterity_bonus} + @{attack_bonus}+@{weapon_mod}-2]]}}" title="d20 + dexterity bonus + attack bonus + miscellaneous weapon modifier - attack penalty">
+								"&{template:default} {{name=Dual Wield Roll}} {{@{weapon_name}=[[d20+{dexterity_bonus} + @{attack_bonus}+@{weapon_mod}-2]]}}" title="d20 + dexterity bonus + attack bonus + miscellaneous weapon modifier - attack penalty">
 								</button>
 							</td>
 						</tr>
@@ -707,7 +707,7 @@
 							<td>&nbsp;</td>
 							<td>
 								<button class="sheet-button" type="roll" 
-								value="&{template:default} {{name=Damage Roll}} {{@{weapon_name} = [[@{damage_dice} + ((floor(@{class}/24)) * (1+floor(@{level}/3))) + ((@{range_type}/4)*@{strength_bonus}) + @{damage_mod}]]}}" title="damage dice + fighter class bonus + strength bonus + miscellaneous damage modifier">
+								value="&{template:default} {{name=Damage Roll}} {{@{weapon_name} = [[@{damage_dice} + ((floor(@{class}/24)) * (1+floor(@{level}/3))) + abs(floor((@{strength_bonus})/(@{range_type}))) + @{damage_mod}]]}}" title="damage dice + fighter class bonus + strength bonus + miscellaneous damage modifier">
 								</button>
 							</td>