diff --git a/AD&D 2E Revised/2ESheet.html b/AD&D 2E Revised/2ESheet.html
index 67ecf17f5f..62fd33d338 100644
--- a/AD&D 2E Revised/2ESheet.html	
+++ b/AD&D 2E Revised/2ESheet.html	
@@ -105,7 +105,7 @@
         </tr>
 </table>
 </div></div>
-<h4><b>Racial Notes:</b></h4><br><textarea name="attr_pnotes" title="@{pnotes}" placeholder="Elves get +1 to attack with Longsword, short short, and bows. &#10;Dwarves get saving throw bonuses from Con. &#10;Halflings get +1 to attack with slings and thrown weapons. &#10;And so on..."></textarea><br>
+<h4><b>Racial Notes:</b></h4><br><textarea name="attr_pnotes" title="@{pnotes}" placeholder="Elves get +1 to attack with Longsword, short sword, and bows. &#10;Dwarves get saving throw bonuses from Con. &#10;Halflings get +1 to attack with slings and thrown weapons. &#10;And so on..."></textarea><br>
 <h4><b>Class Notes:</b></h4><br><textarea name="attr_classnotes" title="@{classnotes}" placeholder="Paladins can turn undead. &#10;Rangers can use tracking. &#10;Bards can identify the general purpose and function of magical items. &#10;And so on"></textarea><hr>
 <div class="sheet-2colrow">
     <div class="sheet-col">
@@ -1329,11 +1329,11 @@
             <input type="radio" name="attr_tab81" class="sheet-tab sheet-tab82" value="2"/><span class="sheet-tab sheet-tab82">Player's Option</span>
             <br>
             <br>
-            <h4><b>Nonproficient weapon penalty:</b></h4><input type="text" name="attr_nonprof-penalty" title="@{nonprof-penalty}" value="-0" class="sheet-min"/>
+            <h4><b>Nonproficient weapon penalty:</b></h4><input type="text" name="attr_nonprof-penalty" title="@{nonprof-penalty}" class="sheet-short" value="-0" list="weapprof-penalty"/>
             <br>
-            <h4><b>Related weapons / familiarity penalty:</b></h4><input type="text" name="attr_famil-penalty" title="@{famil-penalty}" value="-0" class="sheet-min" readonly/>
+            <h4><b>Related weapons / familiarity penalty:</b></h4><input type="text" name="attr_famil-penalty" title="@{famil-penalty}" class="sheet-short" value="-0" readonly/>
             <br>
-            <h4><b>Base ThAC0 number or macro:</b></h4><input type="text" name="attr_thac0-base" title="@{thac0-base}" value="20" class="sheet-display" list="base-thac0"/>
+            <h4><b>Base ThAC0 number or macro:</b></h4><input type="text" name="attr_thac0-base" title="@{thac0-base}" class="sheet-display" list="base-thac0" placeholder="Macro or number"/>
             <br>
             <br>
 
@@ -1589,7 +1589,7 @@
                             <th rowspan="2" title="Weapon name">Weapon</th>
                             <th rowspan="2" title="Proficiency level with weapon">Proficiency</th>
                             <th class="sheet-centering" colspan="4" title="Range modifiers">Range Mod.</th>
-                            <th rowspan="2" title="Number of attacks per round"># of<br>Attacks</th>
+                            <th class="sheet-centering" rowspan="2" title="Rate of fire per round">ROF</th>
                             <th rowspan="2" title="Attack adjustment">Attack<br>Adj.</th>
                             <th rowspan="2" colspan="2" title="To Hit Armor Class 0">THAC0</th>
                             <th rowspan="2" title="Natural roll Crit">Crit</th>
@@ -1623,7 +1623,7 @@
                             <td><label><input type="radio" title="@{range-mod-attack}" value="0" checked/><span></span></label></td>
                             <td><label><input type="radio" title="@{range-mod-attack}" value="-2"/><span></span></label></td>
                             <td><label><input type="radio" title="@{range-mod-attack}" value="-5"/><span></span></label></td>
-                            <td><input type="text" title="@{attacknum2}" class="sheet-table-dynamic"></td>
+                            <td><input type="text" title="@{attacknum2}" class="sheet-cent"></td>
                             <td><input type="text" title="@{attackadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" title="@{ThAC02}" class="sheet-small" value="20"></td>
                             <td><button type="roll" title="%{hit12}" >Hit</button></td>
@@ -1647,7 +1647,7 @@
                             <th rowspan="2" title="Weapon name">Weapon</th>
                             <th rowspan="2" title="Proficiency level with weapon">Proficiency</th>
                             <th class="sheet-centering" colspan="4" title="Range modifiers">Range Mod.</th>
-                            <th rowspan="2" title="Number of attacks per round"># of<br>Attacks</th>
+                            <th class="sheet-centering" rowspan="2" title="Rate of fire per round">ROF</th>
                             <th rowspan="2" title="Attack adjustment">Attack<br>Adj.</th>
                             <th rowspan="2" colspan="2" title="To Hit Armor Class 0">THAC0</th>
                             <th rowspan="2" title="Natural roll Crit">Crit</th>
@@ -1681,7 +1681,7 @@
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="0" checked/><span></span></label></td>
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-2"/><span></span></label></td>
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-5"/><span></span></label></td>
-                            <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-table-dynamic"></td>
+                            <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-cent"></td>
                             <td><input type="text" name="attr_attackadj2" title="@{repeating_weapons2_$X_attackadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>
                             <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[@{ThAC02}-(1d20cs>@{crit-thresh2}+([[(@{attackadj2})+((@{strengthhit})*@{strbonus2})+((@{dexmissile})*@{dexbonus2})+(@{prof-level2})+(@{range-mod-attack})+(@{weaptype-slash2}*(@{armortype-slash}))+(@{weaptype-pierce2}*(@{armortype-pierce}))+(@{weaptype-blunt2}*(@{armortype-blunt}))+(?{Misc. bonus|0})]]))]] using their @{weaponname2}">Hit</button></td>
@@ -1947,7 +1947,7 @@
                             <th rowspan="2" title="Weapon name">Weapon</th>
                             <th rowspan="2" title="Proficiency level with weapon">Proficiency</th>
                             <th class="sheet-centering" colspan="5" title="Range modifiers">Range Mod.</th>
-                            <th rowspan="2" title="Number of attacks per round"># of<br>Attacks</th>
+                            <th class="sheet-centering" rowspan="2" title="Rate of fire per round">ROF</th>
                             <th rowspan="2" title="Attack adjustment">Attack<br>Adj.</th>
                             <th rowspan="2" colspan="2" title="To Hit Armor Class 0">THAC0</th>
                             <th rowspan="2" title="Natural roll Crit">Crit</th>
@@ -1985,7 +1985,7 @@
                             <td><label><input type="radio" title="@{range-mod-attack}" value="-2"/><span></span></label></td>
                             <td><label><input type="radio" title="@{range-mod-attack}" value="-5"/><span></span></label></td>
                             <td><label><input type="radio" title="@{range-mod-attack}" value="-10"/><span></span></label></td>
-                            <td><input type="text" title="@{attacknum2}" class="sheet-table-dynamic"></td>
+                            <td><input type="text" title="@{attacknum2}" class="sheet-cent"></td>
                             <td><input type="text" title="@{attackadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" title="@{ThAC02}" class="sheet-small" value="20"></td>
                             <td><button type="roll" title="%{hit12}" >Hit</button></td>
@@ -2009,7 +2009,7 @@
                             <th rowspan="2" title="Weapon name">Weapon</th>
                             <th rowspan="2" title="Proficiency level with weapon">Proficiency</th>
                             <th class="sheet-centering" colspan="5" title="Range modifiers">Range Mod.</th>
-                            <th rowspan="2" title="Number of attacks per round"># of<br>Attacks</th>
+                            <th class="sheet-centering" rowspan="2" title="Rate of fire per round">ROF</th>
                             <th rowspan="2" title="Attack adjustment">Attack<br>Adj.</th>
                             <th rowspan="2" colspan="2" title="To Hit Armor Class 0">THAC0</th>
                             <th rowspan="2" title="Natural roll Crit">Crit</th>
@@ -2047,7 +2047,7 @@
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-2"/><span></span></label></td>
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-5"/><span></span></label></td>
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-10"/><span></span></label></td>
-                            <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-table-dynamic"></td>
+                            <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-cent"></td>
                             <td><input type="text" name="attr_attackadj2" title="@{repeating_weapons2_$X_attackadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>
                             <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[@{ThAC02}-(1d20cs>@{crit-thresh2}+([[(@{attackadj2})+((@{strengthhit})*@{strbonus2})+((@{dexmissile})*@{dexbonus2})+(@{prof-level2})+(@{range-mod-attack})+(@{weaptype-slash2}*(@{armortype-slash}))+(@{weaptype-pierce2}*(@{armortype-pierce}))+(@{weaptype-blunt2}*(@{armortype-blunt}))+(?{Misc. bonus|0})]]))]] using their @{weaponname2}">Hit</button></td>
@@ -3261,7 +3261,7 @@
                 <h4><b>Weapon Proficiencies</b></h4>
                 <br>
                 <h4><b>Total Weapon proficiency slots:</b></h4>
-                <input type="text" name="attr_weapprof-slots-total" title="@{weapprof-slots-total}" class="sheet-display" list="weapprof-macros"/>
+                <input type="text" name="attr_weapprof-slots-total" title="@{weapprof-slots-total}" class="sheet-display" list="weapprof-macros" placeholder="Macro or number"/>
                 <input type="text" name="attr_weapprofslotssum" value="0" style="display: none;" readonly />
                 <br>
                 <br>
@@ -3329,7 +3329,7 @@
                 <h4><b>Nonweapon Proficiencies</b></h4>
                 <br>
                 <h4><b>Total Nonweapon proficiency slots:</b></h4>
-                <input type="text" name="attr_prof-slots-total" title="@{prof-slots-total}" class="sheet-display" list="prof-macros" />
+                <input type="text" name="attr_prof-slots-total" title="@{prof-slots-total}" class="sheet-display" list="prof-macros" placeholder="Macro or number" />
                 <input type="text" name="attr_profslotssum" value="0" style="display: none;" readonly />
                 <br>
                 <br>
@@ -22624,14 +22624,28 @@ on('change:repeating_customrogue:crl remove:repeating_customrogue', function(){
 // --- End setup Rogue skills total --- //
 
 //Related weapons / familiarity penalty
-on('change:nonprof-penalty', function () {
+on('change:nonprof-penalty', function (eventInfo) {
+    if (eventInfo.sourceType === 'sheetworker') {
+        return;
+    }
     getAttrs(['nonprof-penalty'], function(values) {
-        let nonprof = Math.abs(parseInt(values['nonprof-penalty']) ?? 0) * -1;
-        let famil = Math.floor(nonprof / 2)
-        setAttrs({
-            ['nonprof-penalty']: nonprof,
-            ['famil-penalty']: famil
-        });
+        let number = parseInt(values['nonprof-penalty']);
+        let nonprof;
+        let famil;
+        console.log(number);
+        if (isNaN(number) || number === 0) {
+            setAttrs({
+                ['nonprof-penalty']: '-0',
+                ['famil-penalty']: '-0'
+            });
+        } else {
+            nonprof = Math.abs(number) * -1;
+            famil = Math.floor(nonprof / 2);
+            setAttrs({
+                ['nonprof-penalty']: nonprof,
+                ['famil-penalty']: famil
+            });
+        }
     });
 })
 
@@ -22653,8 +22667,7 @@ on('change:repeating_gear:gearweight change:repeating_gear:gearqty remove:repeat
 
 //Equipment Stored Section
 //Mount Equipment Carried Section Continued
-on('change:repeating_gear-stored:gear-stored-weight change:repeating_gear-stored:gear-stored-qty change:repeating_gear-stored:on-mount remove:repeating_gear-stored change:on-mount change:gear-stored-weight change:gear-stored-qty', function(){
-
+on('change:repeating_gear-stored:gear-stored-weight change:repeating_gear-stored:gear-stored-qty change:repeating_gear-stored:on-mount remove:repeating_gear-stored', function(){
     TAS.repeating('gear-stored')
         .attrs('mount-gear-weight-total','stored-gear-weight-total')
         .fields('on-mount','gear-stored-weight','gear-stored-qty')
diff --git a/AD&D 2E Revised/javascript/sheetWorkers.js b/AD&D 2E Revised/javascript/sheetWorkers.js
index 5fb4e27dc6..62e2fae81c 100644
--- a/AD&D 2E Revised/javascript/sheetWorkers.js	
+++ b/AD&D 2E Revised/javascript/sheetWorkers.js	
@@ -685,14 +685,28 @@ on('change:repeating_customrogue:crl remove:repeating_customrogue', function(){
 // --- End setup Rogue skills total --- //
 
 //Related weapons / familiarity penalty
-on('change:nonprof-penalty', function () {
+on('change:nonprof-penalty', function (eventInfo) {
+    if (eventInfo.sourceType === 'sheetworker') {
+        return;
+    }
     getAttrs(['nonprof-penalty'], function(values) {
-        let nonprof = Math.abs(parseInt(values['nonprof-penalty']) ?? 0) * -1;
-        let famil = Math.floor(nonprof / 2)
-        setAttrs({
-            ['nonprof-penalty']: nonprof,
-            ['famil-penalty']: famil
-        });
+        let number = parseInt(values['nonprof-penalty']);
+        let nonprof;
+        let famil;
+        console.log(number);
+        if (isNaN(number) || number === 0) {
+            setAttrs({
+                ['nonprof-penalty']: '-0',
+                ['famil-penalty']: '-0'
+            });
+        } else {
+            nonprof = Math.abs(number) * -1;
+            famil = Math.floor(nonprof / 2);
+            setAttrs({
+                ['nonprof-penalty']: nonprof,
+                ['famil-penalty']: famil
+            });
+        }
     });
 })
 
@@ -714,8 +728,7 @@ on('change:repeating_gear:gearweight change:repeating_gear:gearqty remove:repeat
 
 //Equipment Stored Section
 //Mount Equipment Carried Section Continued
-on('change:repeating_gear-stored:gear-stored-weight change:repeating_gear-stored:gear-stored-qty change:repeating_gear-stored:on-mount remove:repeating_gear-stored change:on-mount change:gear-stored-weight change:gear-stored-qty', function(){
-
+on('change:repeating_gear-stored:gear-stored-weight change:repeating_gear-stored:gear-stored-qty change:repeating_gear-stored:on-mount remove:repeating_gear-stored', function(){
     TAS.repeating('gear-stored')
         .attrs('mount-gear-weight-total','stored-gear-weight-total')
         .fields('on-mount','gear-stored-weight','gear-stored-qty')
diff --git a/AD&D 2E Revised/raw/2ESheet-raw.html b/AD&D 2E Revised/raw/2ESheet-raw.html
index 2fc4aba003..0f64d7ffed 100644
--- a/AD&D 2E Revised/raw/2ESheet-raw.html	
+++ b/AD&D 2E Revised/raw/2ESheet-raw.html	
@@ -105,7 +105,7 @@
         </tr>
 </table>
 </div></div>
-<h4><b>Racial Notes:</b></h4><br><textarea name="attr_pnotes" title="@{pnotes}" placeholder="Elves get +1 to attack with Longsword, short short, and bows. &#10;Dwarves get saving throw bonuses from Con. &#10;Halflings get +1 to attack with slings and thrown weapons. &#10;And so on..."></textarea><br>
+<h4><b>Racial Notes:</b></h4><br><textarea name="attr_pnotes" title="@{pnotes}" placeholder="Elves get +1 to attack with Longsword, short sword, and bows. &#10;Dwarves get saving throw bonuses from Con. &#10;Halflings get +1 to attack with slings and thrown weapons. &#10;And so on..."></textarea><br>
 <h4><b>Class Notes:</b></h4><br><textarea name="attr_classnotes" title="@{classnotes}" placeholder="Paladins can turn undead. &#10;Rangers can use tracking. &#10;Bards can identify the general purpose and function of magical items. &#10;And so on"></textarea><hr>
 <div class="sheet-2colrow">
     <div class="sheet-col">
@@ -1329,11 +1329,11 @@
             <input type="radio" name="attr_tab81" class="sheet-tab sheet-tab82" value="2"/><span class="sheet-tab sheet-tab82">Player's Option</span>
             <br>
             <br>
-            <h4><b>Nonproficient weapon penalty:</b></h4><input type="text" name="attr_nonprof-penalty" title="@{nonprof-penalty}" value="-0" class="sheet-min"/>
+            <h4><b>Nonproficient weapon penalty:</b></h4><input type="text" name="attr_nonprof-penalty" title="@{nonprof-penalty}" class="sheet-short" value="-0" list="weapprof-penalty"/>
             <br>
-            <h4><b>Related weapons / familiarity penalty:</b></h4><input type="text" name="attr_famil-penalty" title="@{famil-penalty}" value="-0" class="sheet-min" readonly/>
+            <h4><b>Related weapons / familiarity penalty:</b></h4><input type="text" name="attr_famil-penalty" title="@{famil-penalty}" class="sheet-short" value="-0" readonly/>
             <br>
-            <h4><b>Base ThAC0 number or macro:</b></h4><input type="text" name="attr_thac0-base" title="@{thac0-base}" value="20" class="sheet-display" list="base-thac0"/>
+            <h4><b>Base ThAC0 number or macro:</b></h4><input type="text" name="attr_thac0-base" title="@{thac0-base}" class="sheet-display" list="base-thac0" placeholder="Macro or number"/>
             <br>
             <br>
 
@@ -1589,7 +1589,7 @@
                             <th rowspan="2" title="Weapon name">Weapon</th>
                             <th rowspan="2" title="Proficiency level with weapon">Proficiency</th>
                             <th class="sheet-centering" colspan="4" title="Range modifiers">Range Mod.</th>
-                            <th rowspan="2" title="Number of attacks per round"># of<br>Attacks</th>
+                            <th class="sheet-centering" rowspan="2" title="Rate of fire per round">ROF</th>
                             <th rowspan="2" title="Attack adjustment">Attack<br>Adj.</th>
                             <th rowspan="2" colspan="2" title="To Hit Armor Class 0">THAC0</th>
                             <th rowspan="2" title="Natural roll Crit">Crit</th>
@@ -1623,7 +1623,7 @@
                             <td><label><input type="radio" title="@{range-mod-attack}" value="0" checked/><span></span></label></td>
                             <td><label><input type="radio" title="@{range-mod-attack}" value="-2"/><span></span></label></td>
                             <td><label><input type="radio" title="@{range-mod-attack}" value="-5"/><span></span></label></td>
-                            <td><input type="text" title="@{attacknum2}" class="sheet-table-dynamic"></td>
+                            <td><input type="text" title="@{attacknum2}" class="sheet-cent"></td>
                             <td><input type="text" title="@{attackadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" title="@{ThAC02}" class="sheet-small" value="20"></td>
                             <td><button type="roll" title="%{hit12}" >Hit</button></td>
@@ -1647,7 +1647,7 @@
                             <th rowspan="2" title="Weapon name">Weapon</th>
                             <th rowspan="2" title="Proficiency level with weapon">Proficiency</th>
                             <th class="sheet-centering" colspan="4" title="Range modifiers">Range Mod.</th>
-                            <th rowspan="2" title="Number of attacks per round"># of<br>Attacks</th>
+                            <th class="sheet-centering" rowspan="2" title="Rate of fire per round">ROF</th>
                             <th rowspan="2" title="Attack adjustment">Attack<br>Adj.</th>
                             <th rowspan="2" colspan="2" title="To Hit Armor Class 0">THAC0</th>
                             <th rowspan="2" title="Natural roll Crit">Crit</th>
@@ -1681,7 +1681,7 @@
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="0" checked/><span></span></label></td>
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-2"/><span></span></label></td>
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-5"/><span></span></label></td>
-                            <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-table-dynamic"></td>
+                            <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-cent"></td>
                             <td><input type="text" name="attr_attackadj2" title="@{repeating_weapons2_$X_attackadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>
                             <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[@{ThAC02}-(1d20cs>@{crit-thresh2}+([[(@{attackadj2})+((@{strengthhit})*@{strbonus2})+((@{dexmissile})*@{dexbonus2})+(@{prof-level2})+(@{range-mod-attack})+(@{weaptype-slash2}*(@{armortype-slash}))+(@{weaptype-pierce2}*(@{armortype-pierce}))+(@{weaptype-blunt2}*(@{armortype-blunt}))+(?{Misc. bonus|0})]]))]] using their @{weaponname2}">Hit</button></td>
@@ -1947,7 +1947,7 @@
                             <th rowspan="2" title="Weapon name">Weapon</th>
                             <th rowspan="2" title="Proficiency level with weapon">Proficiency</th>
                             <th class="sheet-centering" colspan="5" title="Range modifiers">Range Mod.</th>
-                            <th rowspan="2" title="Number of attacks per round"># of<br>Attacks</th>
+                            <th class="sheet-centering" rowspan="2" title="Rate of fire per round">ROF</th>
                             <th rowspan="2" title="Attack adjustment">Attack<br>Adj.</th>
                             <th rowspan="2" colspan="2" title="To Hit Armor Class 0">THAC0</th>
                             <th rowspan="2" title="Natural roll Crit">Crit</th>
@@ -1985,7 +1985,7 @@
                             <td><label><input type="radio" title="@{range-mod-attack}" value="-2"/><span></span></label></td>
                             <td><label><input type="radio" title="@{range-mod-attack}" value="-5"/><span></span></label></td>
                             <td><label><input type="radio" title="@{range-mod-attack}" value="-10"/><span></span></label></td>
-                            <td><input type="text" title="@{attacknum2}" class="sheet-table-dynamic"></td>
+                            <td><input type="text" title="@{attacknum2}" class="sheet-cent"></td>
                             <td><input type="text" title="@{attackadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" title="@{ThAC02}" class="sheet-small" value="20"></td>
                             <td><button type="roll" title="%{hit12}" >Hit</button></td>
@@ -2009,7 +2009,7 @@
                             <th rowspan="2" title="Weapon name">Weapon</th>
                             <th rowspan="2" title="Proficiency level with weapon">Proficiency</th>
                             <th class="sheet-centering" colspan="5" title="Range modifiers">Range Mod.</th>
-                            <th rowspan="2" title="Number of attacks per round"># of<br>Attacks</th>
+                            <th class="sheet-centering" rowspan="2" title="Rate of fire per round">ROF</th>
                             <th rowspan="2" title="Attack adjustment">Attack<br>Adj.</th>
                             <th rowspan="2" colspan="2" title="To Hit Armor Class 0">THAC0</th>
                             <th rowspan="2" title="Natural roll Crit">Crit</th>
@@ -2047,7 +2047,7 @@
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-2"/><span></span></label></td>
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-5"/><span></span></label></td>
                             <td><label><input type="radio" name="attr_range-mod-attack" title="@{repeating_weapons2_$X_range-mod-attack}" value="-10"/><span></span></label></td>
-                            <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-table-dynamic"></td>
+                            <td><input type="text" name="attr_attacknum2" title="@{repeating_weapons2_$X_attacknum2}" class="sheet-cent"></td>
                             <td><input type="text" name="attr_attackadj2" title="@{repeating_weapons2_$X_attackadj2}" class="sheet-table-dynamic" value="0"></td>
                             <td><input type="text" name="attr_ThAC02" title="@{repeating_weapons2_$X_ThAC02}" class="sheet-small" value="20"></td>
                             <td><button type="roll" name="roll_hit12" title="%{repeating_weapons2_$X_hit12}" value="/em hits an AC of [[@{ThAC02}-(1d20cs>@{crit-thresh2}+([[(@{attackadj2})+((@{strengthhit})*@{strbonus2})+((@{dexmissile})*@{dexbonus2})+(@{prof-level2})+(@{range-mod-attack})+(@{weaptype-slash2}*(@{armortype-slash}))+(@{weaptype-pierce2}*(@{armortype-pierce}))+(@{weaptype-blunt2}*(@{armortype-blunt}))+(?{Misc. bonus|0})]]))]] using their @{weaponname2}">Hit</button></td>
@@ -3261,7 +3261,7 @@
                 <h4><b>Weapon Proficiencies</b></h4>
                 <br>
                 <h4><b>Total Weapon proficiency slots:</b></h4>
-                <input type="text" name="attr_weapprof-slots-total" title="@{weapprof-slots-total}" class="sheet-display" list="weapprof-macros"/>
+                <input type="text" name="attr_weapprof-slots-total" title="@{weapprof-slots-total}" class="sheet-display" list="weapprof-macros" placeholder="Macro or number"/>
                 <input type="text" name="attr_weapprofslotssum" value="0" style="display: none;" readonly />
                 <br>
                 <br>
@@ -3329,7 +3329,7 @@
                 <h4><b>Nonweapon Proficiencies</b></h4>
                 <br>
                 <h4><b>Total Nonweapon proficiency slots:</b></h4>
-                <input type="text" name="attr_prof-slots-total" title="@{prof-slots-total}" class="sheet-display" list="prof-macros" />
+                <input type="text" name="attr_prof-slots-total" title="@{prof-slots-total}" class="sheet-display" list="prof-macros" placeholder="Macro or number" />
                 <input type="text" name="attr_profslotssum" value="0" style="display: none;" readonly />
                 <br>
                 <br>