diff --git a/Rolemaster-Standard-System/charsheet_RMSS_fullcalcs_RollTemplates.html b/Rolemaster-Standard-System/charsheet_RMSS_fullcalcs_RollTemplates.html
index 609798efa9..ff28427c88 100644
--- a/Rolemaster-Standard-System/charsheet_RMSS_fullcalcs_RollTemplates.html
+++ b/Rolemaster-Standard-System/charsheet_RMSS_fullcalcs_RollTemplates.html
@@ -1,10 +1,10 @@
 <!-- RoleMaster Standard System Character Sheet -->
 <!-- by Diana P. -->
 <!-- I borrowed some code/equations from Brian. And Sam. And Aaron I. And others -->
-<!-- Version 2.3.17 (full nested calculations; sheet helpers; xp calculation.) dated 04/12/2018 -->
+<!-- Version 2.3.20 (full nested calculations; sheet helpers; xp calculation.) dated 06/04/2018 -->
 <input type="hidden" name="attr_character_sheet" title="character-sheet" value="RMSS-FullCalcs"/>
-<input type="hidden" name="attr_currentsheetversion" title="currentsheetversion" value="3.17" />
-<p style="font-size: 0.6em;">V2.<span name="attr_sheetversion" title="sheetversion" ></span> 04/12/18 by Diana P.</p>
+<input type="hidden" name="attr_currentsheetversion" title="currentsheetversion" value="3.20" />
+<p style="font-size: 0.6em;">V2.<span name="attr_sheetversion" title="sheetversion" ></span> 06/04/18 by Diana P.</p>
 <input type="radio" class="sheet-switch-pc-show sheet-switch" title="npc-show" name="attr_npc-show" value="1" checked="checked" /><span style="text-align: left;"><span data-i18n="pc">PC</span> &nbsp; &nbsp; </span>
 <input type="radio" class="sheet-switch-npc-show sheet-switch" title="npc-show" name="attr_npc-show" value="2" /><span style="text-align: left;"><span data-i18n="npc">NPC</span> &nbsp; &nbsp; </span>
 <input type="radio" class="sheet-switch-rtmplt-show sheet-switch" title="npc-show" name="attr_npc-show" value="3" /><span style="text-align: left;" data-i18n="roll-templates">Roll Templates</span>
@@ -321,9 +321,8 @@
 								</div>
 								<div class="sheet-table-row"> 
 									<span class="sheet-table-data-center"><span data-i18n="base-movement-rate">Base Movement Rate</span>:</span>
-									<span class="sheet-table-data-center"><input type="text" name="attr_basemoverate" title="basemoverate" title="basemoverate" value="50+(5*ceil((@{height}/6)-12.5))[stride mod] +3*(@{qubonus})+ (@{weightpenalty})" disabled="true" /></span> 
-									<span class="sheet-table-data-center"></span>
-									<span class="sheet-table-data-center"></span>
+									<span class="sheet-table-data-center"><input type="text" name="attr_basemoverate" title="basemoverate" title="basemoverate" value="(50+(5*ceil((@{height}/6)-12.5))[stride mod] +3*(@{qubonus})+ (@{weightpenalty})+@{bonusbasemoverate})" disabled="true" /></span> 
+									<span class="sheet-table-data-center">Bonus Base Movement Rate
 								</div>
 								<div class="sheet-table-row"> 
 									<span class="sheet-table-data-center"><span data-i18n="running-horizontal-jump">Running Horizontal Jump</span>:</span>
@@ -519,9 +518,9 @@
 							<span class="sheet-table-data"> &nbsp; &nbsp; </span>			
 						</div>
 						<div>
-							<span class="sheet-table-data"> 75%:<input type="text" name="attr_hitpoints-75" title="hitpoints-75" value="((@{bodydev})*.75)" style="width: 35px;" disabled="true" />|</span>
-							<span class="sheet-table-data"> 50%:<input type="text" name="attr_hitpoints-50" title="hitpoints-50" value="((@{bodydev})*.5)" style="width: 35px;" disabled="true" />|</span>
-							<span class="sheet-table-data"> 25%:<input type="text" name="attr_hitpoints-25" title="hitpoints-25" value="((@{bodydev})*.25)" style="width: 35px;" disabled="true" /></span>
+							<span class="sheet-table-data"> 75%(-10):<input type="text" name="attr_hitpoints-75" title="hitpoints-75" value="((@{bodydev})*.75)" style="width: 35px;" disabled="true" />|</span>
+							<span class="sheet-table-data"> 50%(-20):<input type="text" name="attr_hitpoints-50" title="hitpoints-50" value="((@{bodydev})*.5)" style="width: 35px;" disabled="true" />|</span>
+							<span class="sheet-table-data"> 25%(-30):<input type="text" name="attr_hitpoints-25" title="hitpoints-25" value="((@{bodydev})*.25)" style="width: 35px;" disabled="true" /></span>
 						</div>
 						<div> <br> </div>
 						<div>
@@ -8859,7 +8858,7 @@
 			<table>
 				<tr class="sheet-table-header">
 					<td style="width: 200px;"><span data-i18n="total-weight">Total Weight</span>:<input type="text" style="width: 80px;" name="attr_totalweightcarried" title="totalweightcarried" value="0" /><span data-i18n="pounds-a">lbs.</span> </td>
-					<td style="width: 250px;"><span data-i18n="encumbrance-penalty">Encumbrance Penalty</span>:<input type="text" style="width: 50px;" name="attr_encumbrancepen" title="encumbrancepen" value="(-8*floor(10*@{totalweightcarried}/(@{weight}+1)))" disabled="true" /> </td>
+					<td style="width: 250px;"><span data-i18n="encumbrance-penalty">Encumbrance Penalty</span>:<input type="text" style="width: 50px;" name="attr_encumbrancepen" title="encumbrancepen" value="(-8*floor(@{totalweightcarried}/(@{weightallowance}+1)))" disabled="true" /> </td>
 					<td style="width: 250px;"><span data-i18n="weight-penalty">Weight Penalty</span>:<input type="text" style="width: 50px;" name="attr_weightpenalty" title="weightpenalty" value="ceil((0-(@{dbquickpen1}+@{encumbrancepen}+(3*((@{stbonus}+abs(@{stbonus}))/2))))/1e10)*(@{dbquickpenworn}+@{encumbrancepen}+(3*((@{stbonus}+abs(@{stbonus}))/2)))" disabled="true" /> </td>
 				</tr>
 			</table>