diff --git a/Mass Effect/Mass Effect.html b/Mass Effect/Mass Effect.html
index 398d0bf18f..a3b49a15c2 100644
--- a/Mass Effect/Mass Effect.html	
+++ b/Mass Effect/Mass Effect.html	
@@ -515,8 +515,8 @@
                             <option value="@{Dexterity-mod}">Dex</option>
                             <option value="@{Constitution-mod}">Con</option>
                             <option value="@{Intelligence-mod}">Int</option>
-                            <option value="@{Wisdom-mod}">Wis</option>
-                            <option value="@{Charisma-mod}" selected>Cha</option>
+                            <option value="@{Wisdom-mod}" selected>Wis</option>
+                            <option value="@{Charisma-mod}>Cha</option>
                         </select>
                     </td>
                     <td><input type="number" class="sheet-number" name="attr_Gamble-Ranks" value="0"/></td>
@@ -1158,8 +1158,8 @@
                             <option value="@{Strength-mod}">Str</option>
                             <option value="@{Dexterity-mod}">Dex</option>
                             <option value="@{Constitution-mod}">Con</option>
-                            <option value="@{Intelligence-mod}" selected>Int</option>
-                            <option value="@{Wisdom-mod}">Wis</option>
+                            <option value="@{Intelligence-mod}">Int</option>
+                            <option value="@{Wisdom-mod}" selected>Wis</option>
                             <option value="@{Charisma-mod}">Cha</option>
                         </select>
                     </td>
@@ -1225,9 +1225,9 @@
                         <select class="sheet-number" name="attr_Survival-ability" style="width:40px;">
                             <option value="@{Strength-mod}">Str</option>
                             <option value="@{Dexterity-mod}">Dex</option>
-                            <option value="@{Constitution-mod}">Con</option>
+                            <option value="@{Constitution-mod}" selected>Con</option>
                             <option value="@{Intelligence-mod}">Int</option>
-                            <option value="@{Wisdom-mod}" selected>Wis</option>
+                            <option value="@{Wisdom-mod}">Wis</option>
                             <option value="@{Charisma-mod}">Cha</option>
                         </select>
                     </td>
@@ -1240,8 +1240,8 @@
                     <td><input type="number" class="sheet-ability" name="attr_Swim" value="[[@{Swim-ability}+@{Swim-Ranks}+@{Swim-Misc}]]" disabled="true"/></td>
                     <td>
                         <select class="sheet-number" name="attr_Swim-ability" style="width:40px;">
-                            <option value="@{Strength-mod}" selected>Str</option>
-                            <option value="@{Dexterity-mod}">Dex</option>
+                            <option value="@{Strength-mod}">Str</option>
+                            <option value="@{Dexterity-mod}" selected>Dex</option>
                             <option value="@{Constitution-mod}">Con</option>
                             <option value="@{Intelligence-mod}">Int</option>
                             <option value="@{Wisdom-mod}">Wis</option>
@@ -1520,16 +1520,21 @@
     <fieldset class="repeating_weapons">
         <table class="sheet-tableII">
             <tr>
-                <th rowspan="4"><button type="roll" class="sheet-weapon" name="weapon_roll" value="[1d20+@{BAB}-@{Weapon-Recoil}]">Weapon</button></th>
+                <th rowspan="4"><button type="roll" class="sheet-weapon" name="weapon_roll" value="&amp;{template:attack}{{character= @{character_name}}}{{weapon= @{Weapon-Name}}}{{attack= [[1d20cs>@{Weapon-Critical} +[[@{Weapon-Attack_Bonus}]] ]]}} {{confirm= [[1d20 +[[@{Weapon-Attack_Bonus}]] ]]}} {{damage= [[@{Weapon-Damage} + @{Weapon-Damage_bonus} + @{Weapon-Damage_Misc}]]}}{{dmgcrit= [[(@{Weapon-Damage} + @{Weapon-Damage_bonus} + [[@{Weapon-Damage_Misc}]])*@{Weapon-Critical_multiplier}]]}} {{details= @{Weapon-Special_Properties}}}">Weapon</button></th>
                 <th class="sheet-heading">Name</th>
+                <th class="sheet-heading">Total Bonus</th>
+                <th class="sheet-heading">BAB</th>
                 <th class="sheet-heading">Type</th>
                 <th class="sheet-heading">Attribute</th>
+                <th class="sheet-heading">Misc Bonus</th>
                 <th class="sheet-heading">Critical</th>
                 <th class="sheet-heading">Recoil</th>
                 <th class="sheet-heading">Ammo</th>
             </tr>
             <tr>
                 <td><input type="text" class="sheet-number" name="attr_Weapon-Name" value="" /></td>
+                <td><input type="number" class="sheet-number" name="attr_Weapon-Attack_Bonus" value="@{Weapon-BAB}+@{Weapon-Attribute}+@{Weapon-Attack_Misc}" disabled='true'/></td>
+                <td><input type="number" class="sheet-number" name="attr_Weapon-BAB" value="@{BAB}"disabled='true'/></td>
                 <td>
                     <select class="sheet-number" name="attr_Weapon-Type" >
                         <option value="Pistols">Pistols</option>
@@ -1551,23 +1556,35 @@
                         <option value="@{Charisma-mod}">Charisma</option>
                     </select>
                 </td>
-                <td><input type="text" class="sheet-number" name="attr_Weapon-Critical" value="" style="width:60px"/></td>
+                <td><input type="number" class="sheet-number" name="attr_Weapon-Attack_Misc" value="0" /></td>
+                <td><input type="number" class="sheet-number" name="attr_Weapon-Critical" value="20" style="width:26px"/><input type="number" class="sheet-number" name="attr_Weapon-Critical_multiplier" value="2" style="width:24px"/></td>
                 <td><input type="number" class="sheet-number" name="attr_Weapon-Recoil" value="0" placeholder="-3, etc." style="width:40px"/></td>
                 <td><input type="number" class="sheet-number" name="attr_Weapon-Ammo" value="0"  style="width:50px"/></td>
             </tr>
             <tr>
-                <td colspan="3"><input type="text" class="sheet-number" name="attr_Weapon-Variant_Properties" value="" style="width:80%"/></td>
+                <td colspan="3"><input type="text" class="sheet-number" name="attr_Weapon-Special_Properties" value="" style="width:80%"/></td>
                 <td><input type="text" class="sheet-number" name="attr_Weapon-Damage" value="1d6" placeholder="1d6" style="width:60px;"/></td>
+                <td>
+                    <select class="sheet-number" name="attr_Weapon-Damage_bonus" style="width:60px;" >
+                        <option value="0">None</option>
+                        <option value="[[floor(@{Strength-mod}/2)]]">1/2 Str</option>
+                        <option value="[[@{Strength-mod}]]" selected>Str</option>
+                        <option value="[[floor(@{Strength-mod}*1.5)]]">1 1/2 Str</option>
+                        <option value="[[@{Strength-mod}*2]]">2x Str</option>
+                        <option value="@{Dexterity-mod}">Dex</option>
+                    </select>
+                </td>
+                <td><input type="text" class="sheet-number" name="attr_Weapon-Damage_Misc" value="0" style="width:50px;"/></td>
                 <td><input type="text" class="sheet-number" name="attr_Weapon-Variant" value="" placeholder="I, etc." style="width:40px"></td>
                 <td><input type="number" class="sheet-number" name="attr_Weapon-Range" value="0" style="width:40px"/></td>
-                <td><input type="text" class="sheet-number" name="attr_Weapon-Weight" value="" placeholder="5 lb" style="width:50px;"/></td>
             </tr>
             <tr>
-                <th class="sheet-heading" colspan="3">Variant Properties</th>
-                <th class="sheet-heading">Damage</th>
+                <th class="sheet-heading" colspan="3">Special Properties</th>
+                <th class="sheet-heading">Damage<br>Dice</th>
+                <th class="sheet-heading">Damage<br>Bonus</th>
+                <th class="sheet-heading">Misc<br>Bonus</th>
                 <th class="sheet-heading">Variant</th>
                 <th class="sheet-heading">Range</th>
-                <th class="sheet-heading">Weight</th>
             </tr>
         </table>
     </fieldset>