diff --git a/Naruto d20 Modern/Naruto d20 Modern.html b/Naruto d20 Modern/Naruto d20 Modern.html
index 536739bec8..9a8e841003 100644
--- a/Naruto d20 Modern/Naruto d20 Modern.html	
+++ b/Naruto d20 Modern/Naruto d20 Modern.html	
@@ -238,7 +238,7 @@
                 </tr>
                 <tr>
                     <th><button type="roll" class="sheet-skillbtn" name="roll_Fortitude" value="/e rolls Fortitude [[1d20+@{Fortitude}]]" >FORTITUDE<br>Constitution</button></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Fortitude" value="[[@{Fortitude-Base}+@{Fortitude-ability}+@{Fortitude-Equipment}+@{Fortitude-Other}]]" disabled='true'/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Fortitude" value="[[@{Fortitude-Base}+@{Fortitude-ability}+@{Fortitude-Equipment}+@{Fortitude-Other}+@{PU-saves}]]" disabled='true'/></th>
                     <td><input type="number" class="sheet-number" name="attr_Fortitude-Base" value="@{Class1-Fort}+@{Class2-Fort}+@{Class3-Fort}+@{Class4-Fort}+@{Class5-Fort}+@{Class6-Fort}" disabled='true'/></td>
                     <td>
                         <select class="sheet-number" name="attr_Fortitude-ability">
@@ -255,7 +255,7 @@
                 </tr>
                 <tr>
                     <th><button type="roll" class="sheet-skillbtn" name="roll_Reflex" value="/e rolls Reflex [[1d20+@{Reflex}]]" >REFLEX<br>Dexterity</button></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Reflex" value="[[@{Reflex-Base}+@{Reflex-ability}+@{Reflex-Equipment}+@{Reflex-Other}]]" disabled='true'/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Reflex" value="[[@{Reflex-Base}+@{Reflex-ability}+@{Reflex-Equipment}+@{Reflex-Other}+@{PU-saves}]]" disabled='true'/></th>
                     <td><input type="number" class="sheet-number" name="attr_Reflex-Base" value="@{Class1-Refl}+@{Class2-Refl}+@{Class3-Refl}+@{Class4-Refl}+@{Class5-Refl}+@{Class6-Refl}" disabled='true'/></td>
                     <td>
                         <select class="sheet-number" name="attr_Reflex-ability">
@@ -272,7 +272,7 @@
                 </tr>
                 <tr>
                     <th><button type="roll" class="sheet-skillbtn" name="roll_Will" value="/e rolls Will [[1d20+@{Will}]]" >WILL<br>Wisdom</button></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Will" value="[[@{Will-Base} + @{Will-ability} + @{Will-Equipment} + @{Will-Other}]]" disabled='true'/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Will" value="[[@{Will-Base} + @{Will-ability} + @{Will-Equipment} + @{Will-Other}+@{PU-saves}]]" disabled='true'/></th>
                     <td><input type="number" class="sheet-number" name="attr_Will-Base" value="@{Class1-Will}+@{Class2-Will}+@{Class3-Will}+@{Class4-Will}+@{Class5-Will}+@{Class6-Will}" disabled='true'/></td>
                     <td>
                         <select class="sheet-number" name="attr_Will-ability">
@@ -438,7 +438,7 @@
                 <tr>
                     <td><input type="checkbox" class="sheet-bigcheck" name="attr_Balance-CrossClass" value="2"/><span></span></td>
                     <td><button type="roll" class="sheet-btn" name="roll_Balance" value="/e rolls Balance [[1d20+@{Balance}]]" >Balance</button></td>
-                    <td><input type="number" class="sheet-ability" name="attr_Balance" value="[[@{Balance-ability}+@{Balance-Ranks}+@{Balance-Misc}]]" disabled="true"/></td>
+                    <td><input type="number" class="sheet-ability" name="attr_Balance" value="[[@{Balance-ability}+@{Balance-Ranks}+@{Balance-Misc}+@{PU-Skills}]]" disabled="true"/></td>
                     <td>
                         <select class="sheet-number" name="attr_Balance-ability" style="width:40px;">
                             <option value="@{Strength-mod}">Str</option>
@@ -489,7 +489,7 @@
                 <tr>
                     <td><input type="checkbox" class="sheet-bigcheck" name="attr_Climb-CrossClass" value="2"/><span></span></td>
                     <td><button type="roll" class="sheet-btn" name="roll_Climb" value="/e rolls Climb [[1d20+@{Climb}]]" >Climb</button></td>
-                    <td><input type="number" class="sheet-ability" name="attr_Climb" value="[[@{Climb-ability}+@{Climb-Ranks}+@{Climb-Misc}]]" disabled="true"/></td>
+                    <td><input type="number" class="sheet-ability" name="attr_Climb" value="[[@{Climb-ability}+@{Climb-Ranks}+@{Climb-Misc}+@{PU-Skills}]]" disabled="true"/></td>
                     <td>
                         <select class="sheet-number" name="attr_Climb-ability" style="width:40px;">
                             <option value="@{Strength-mod}" selected>Str</option>
@@ -827,7 +827,7 @@
                 <tr>
                     <td><input type="checkbox" class="sheet-bigcheck" name="attr_Hide-CrossClass" value="2"/><span></span></td>
                     <td><button type="roll" class="sheet-btn" name="roll_Hide" value="/e rolls Hide [[1d20+@{Hide}]]" >Hide</button></td>
-                    <td><input type="number" class="sheet-ability" name="attr_Hide" value="[[@{Hide-ability}+@{Hide-Ranks}+@{Hide-Misc}]]" disabled="true"/></td>
+                    <td><input type="number" class="sheet-ability" name="attr_Hide" value="[[@{Hide-ability}+@{Hide-Ranks}+@{Hide-Misc}+@{PU-Skills}]]" disabled="true"/></td>
                     <td>
                         <select class="sheet-number" name="attr_Hide-ability" style="width:40px;">
                             <option value="@{Strength-mod}">Str</option>
@@ -878,7 +878,7 @@
                 <tr>
                     <td><input type="checkbox" class="sheet-bigcheck" name="attr_Jump-CrossClass" value="2"/><span></span></td>
                     <td><button type="roll" class="sheet-btn" name="roll_Jump" value="/e rolls Jump [[1d20+@{Jump}]]" >Jump</button></td>
-                    <td><input type="number" class="sheet-ability" name="attr_Jump" value="[[@{Jump-ability}+@{Jump-Ranks}+@{Jump-Misc}+@{Armor-Penalty}]]" disabled="true"/></td>
+                    <td><input type="number" class="sheet-ability" name="attr_Jump" value="[[@{Jump-ability}+@{Jump-Ranks}+@{Jump-Misc}+@{Armor-Penalty}+@{PU-Skills}]]" disabled="true"/></td>
                     <td>
                         <select class="sheet-number" name="attr_Jump-ability" style="width:40px;">
                             <option value="@{Strength-mod}" selected>Str</option>
@@ -1115,7 +1115,7 @@
                 <tr>
                     <td><input type="checkbox" class="sheet-bigcheck" name="attr_Listen-CrossClass" value="2"/><span></span></td>
                     <td><button type="roll" class="sheet-btn" name="roll_Listen" value="/e rolls Listen [[1d20+@{Listen}]]" >Listen</button></td>
-                    <td><input type="number" class="sheet-ability" name="attr_Listen" value="[[@{Listen-ability}+@{Listen-Ranks}+@{Listen-Misc}]]" disabled="true"/></td>
+                    <td><input type="number" class="sheet-ability" name="attr_Listen" value="[[@{Listen-ability}+@{Listen-Ranks}+@{Listen-Misc}+@{PU-Skills}]]" disabled="true"/></td>
                     <td>
                         <select class="sheet-number" name="attr_Listen-ability" style="width:40px;">
                             <option value="@{Strength-mod}">Str</option>
@@ -1132,7 +1132,7 @@
                 <tr>
                     <td><input type="checkbox" class="sheet-bigcheck" name="attr_Move_Silently-CrossClass" value="2"/><span></span></td>
                     <td><button type="roll" class="sheet-btn" name="roll_Move_Silently" value="/e rolls Move Silently [[1d20+@{Move_Silently}]]" >Move Silently</button></td>
-                    <td><input type="number" class="sheet-ability" name="attr_Move_Silently" value="[[@{Move_Silently-ability}+@{Move_Silently-Ranks}+@{Move_Silently-Misc}+@{Armor-Penalty}]]" disabled="true"/></td>
+                    <td><input type="number" class="sheet-ability" name="attr_Move_Silently" value="[[@{Move_Silently-ability}+@{Move_Silently-Ranks}+@{Move_Silently-Misc}+@{Armor-Penalty}+@{PU-Skills}]]" disabled="true"/></td>
                     <td>
                         <select class="sheet-number" name="attr_Move_Silently-ability" style="width:40px;">
                             <option value="@{Strength-mod}">Str</option>
@@ -1391,7 +1391,7 @@
                 <tr>
                     <td><input type="checkbox" class="sheet-bigcheck" name="attr_Spot-CrossClass" value="2"/><span></span></td>
                     <td><button type="roll" class="sheet-btn" name="roll_Spot" value="/e rolls Spot [[1d20+@{Spot}]]" >Spot</button></td>
-                    <td><input type="number" class="sheet-ability" name="attr_Spot" value="[[@{Spot-ability}+@{Spot-Ranks}+@{Spot-Misc}]]" disabled="true"/></td>
+                    <td><input type="number" class="sheet-ability" name="attr_Spot" value="[[@{Spot-ability}+@{Spot-Ranks}+@{Spot-Misc}+@{PU-Skills}]]" disabled="true"/></td>
                     <td>
                         <select class="sheet-number" name="attr_Spot-ability" style="width:40px;">
                             <option value="@{Strength-mod}">Str</option>
@@ -1425,7 +1425,7 @@
                 <tr>
                     <td><input type="checkbox" class="sheet-bigcheck" name="attr_Swim-CrossClass" value="2"/><span></span></td>
                     <td><button type="roll" class="sheet-btn" name="roll_Swim" value="/e rolls Swim [[1d20+@{Swim}]]" >Swim</button></td>
-                    <td><input type="number" class="sheet-ability" name="attr_Swim" value="[[@{Swim-ability}+@{Swim-Ranks}+@{Swim-Misc}+@{Armor-Penalty}]]" disabled="true"/></td>
+                    <td><input type="number" class="sheet-ability" name="attr_Swim" value="[[@{Swim-ability}+@{Swim-Ranks}+@{Swim-Misc}+@{Armor-Penalty}+@{PU-Skills}]]" disabled="true"/></td>
                     <td>
                         <select class="sheet-number" name="attr_Swim-ability" style="width:40px;">
                             <option value="@{Strength-mod}" selected>Str</option>
@@ -1476,7 +1476,7 @@
                 <tr>
                     <td><input type="checkbox" class="sheet-bigcheck" name="attr_Tumble-CrossClass" value="2"/><span></span></td>
                     <td><button type="roll" class="sheet-btn" name="roll_Tumble" value="/e rolls Tumble [[1d20+@{Tumble}]]" >Tumble *</button></td>
-                    <td><input type="number" class="sheet-ability" name="attr_Tumble" value="[[@{Tumble-ability}+@{Tumble-Ranks}+@{Tumble-Misc}+@{Armor-Penalty}]]" disabled="true"/></td>
+                    <td><input type="number" class="sheet-ability" name="attr_Tumble" value="[[@{Tumble-ability}+@{Tumble-Ranks}+@{Tumble-Misc}+@{Armor-Penalty}+@{PU-Skills}]]" disabled="true"/></td>
                     <td>
                         <select class="sheet-number" name="attr_Tumble-ability" style="width:40px;">
                             <option value="@{Strength-mod}">Str</option>
@@ -1540,7 +1540,7 @@
                 </tr>
                 <tr>
                     <th><button type="roll" class="sheet-skillbtn" name="roll_Initiative" title="roll_Initiative" value="/e rolls Initiative [[1d20+@{Initiative} &{tracker}]]" >Initiative</button></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Initiative" title="@{Initiative}" value="@{Initiative-ability}+@{Initiative-Misc}" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Initiative" title="@{Initiative}" value="@{Initiative-ability}+@{Initiative-Misc}+@{PU-Initiative}" disabled="true"/></th>
                     <td>
                         <select class="sheet-number" name="attr_Initiative-ability" style="width:40px;">
                             <option value="@{Strength-mod}">Str</option>
@@ -1598,7 +1598,7 @@
                 </tr>
                 <tr>
                     <th style="font-size:0.8em;"><button type="roll" class="sheet-skillbtn" name="roll_MAB" title="roll_MAB" value="/e rolls Melee Attack Bonus [[1d20+@{MAB}]]" >Melee<br>Attack Bonus</button></th>
-                    <th><input type="number" class="sheet-ability" name="attr_MAB" title="@{MAB}" value="[[@{MAB-BAB}+@{MAB-ability}+@{MAB-Size}+@{MAB-Misc}]]" disabled='true'/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_MAB" title="@{MAB}" value="[[@{MAB-BAB}+@{MAB-ability}+@{MAB-Size}+@{MAB-Misc}+@{PU-attack}]]" disabled='true'/></th>
                     <td><input type="number" class="sheet-number" name="attr_MAB-BAB" value="@{BAB}" disabled='true'/></td>
                     <td>
                         <select class="sheet-number" name="attr_MAB-ability" style="width:40px;">
@@ -1615,7 +1615,7 @@
                 </tr>
                 <tr>
                     <th style="font-size:0.8em;"><button type="roll" class="sheet-skillbtn" name="roll_grapple" title="roll_grapple" value="/e rolls Grapple Attack Bonus [[1d20+@{grapple}]]" >Grapple<br>Attack Bonus</button></th>
-                    <th><input type="number" class="sheet-ability" name="attr_grapple" title="@{grapple}" value="[[@{grapple-BAB}+@{grapple-ability}+@{grapple-Size}+@{grapple-Misc}]]" disabled='true'/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_grapple" title="@{grapple}" value="[[@{grapple-BAB}+@{grapple-ability}+@{grapple-Size}+@{grapple-Misc}+@{PU-attack}]]" disabled='true'/></th>
                     <td><input type="number" class="sheet-number" name="attr_grapple-BAB" value="@{BAB}"  disabled='true'/></td>
                     <td>
                         <select class="sheet-number" name="attr_grapple-ability" style="width:40px;">
@@ -1644,7 +1644,7 @@
                 </tr>
                 <tr>
                     <th style="font-size:0.8em;"><button type="roll" class="sheet-skillbtn" name="roll_RAB" title="roll_RAB" value="/e rolls Ranged Attack Bonus [[1d20+@{RAB}]]" >Ranged<br>Attack Bonus</button></th>
-                    <th><input type="number" class="sheet-ability" name="attr_RAB" title="@{RAB}" value="[[@{RAB-BAB}+@{RAB-ability}+@{RAB-Size}+@{RAB-Misc}]]" disabled='true'/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_RAB" title="@{RAB}" value="[[@{RAB-BAB}+@{RAB-ability}+@{RAB-Size}+@{RAB-Misc}+@{PU-attack}]]" disabled='true'/></th>
                     <td><input type="number" class="sheet-number" name="attr_RAB-BAB" value="@{BAB}" disabled='true'/></td>
                     <td>
                         <select class="sheet-number" name="attr_RAB-ability" style="width:40px;">
@@ -1731,8 +1731,88 @@
                         </td>
                     </tr>
                 </table>
-        </div>
+				<br>
+			<h4>Power Units</h4>
+			    <table class="sheet-tableII">
+					<tr>
+                        <th class="sheet-heading"/>Total</th>
+                        <th class="sheet-heading"/>Base</th>
+						<th class="sheet-heading"/>Misc</th>
+					</tr>
+					<td>
+						<input type="number" class="sheet-number" name="attr_PU-total" value="@{PU-base}+@{PU-misc}" style="width:40px" disabled="true"/>
+					</td>
+					<td>
+						<input type="number" class="sheet-number" name="attr_PU-base" value="0" style="width:40px"/>
+					</td>
+					<td>
+						<input type="number" class="sheet-number" name="attr_PU-misc" value="0" style="width:40px"/>
+					</td>
+				</table>
+				<table class="sheet-tableII">
+					<tr>
+						<th class="sheet-heading"/>Name</th>
+						<th class="sheet-heading"/>Bonus</th>
+					</tr>
+					<tr>
+						<th type="text" class="sheet-heading" name="attr_DodgePU" style="width:40px">Dodge</th>
+							<td>						
+								<input type="number" class="sheet-number" name="attr_PU-dodge" value="floor((0.5)*(@{PU-total}))" disabled="true"/>
+							</td>
+					</tr>
+					<tr>
+						<th type="text" class="sheet-heading" name="attr_HPPU" style="width:40px">HP</th>
+							<td>
+								<input type="number" class="sheet-number" name="attr_PU-hp" value="floor((@{Character_Level})/2)*(@{PU-total})" disabled="true"/>
+							</td>
+					</tr>
+					<tr>
+						<th type="text" class="sheet-heading" name="attr_LearnPU" style="width:40px">Learn</th>
+							<td>
+								<input type="number" class="sheet-number" name="attr_PU-learn" value="@{PU-total}" disabled="true"/>
+							</td>
+					</tr>
+					<tr>
+						<th type="text" class="sheet-heading" name="attr_AttackPU" style="width:40px">Attack</th>
+							<td>
+								<input type="number" class="sheet-number" name="attr_PU-attack" value="@{PU-total}" disabled="true"/>
+							</td>
+					</tr>
+					<tr>
+						<th type="text" class="sheet-heading" name="attr_SavesPU" style="width:40px">Saves</th>
+							<td>
+								<input type="number" class="sheet-number" name="attr_PU-saves" value="@{PU-total}" disabled="true"/>
+							</td>
+					</tr>
+					<tr>
+						<th type="text" class="sheet-heading" name="attr_ChakraPU" style="width:40px">Chakra</th>
+							<td>
+								<input type="number" class="sheet-number" name="attr_PU-ChakraPool" value="(2)*(@{PU-total})" disabled="true"/>
+							</td>
+					</tr>
+					<tr>
+						<th type="text" class="sheet-heading" name="attr_InitiativePU" style="width:40px">Initiative</th>
+							<td>
+								<input type="number" class="sheet-number" name="attr_PU-Initiative" value="(2)*(@{PU-total})" disabled="true"/>
+							</td>
+					</tr>
+					<tr>
+						<th type="text" class="sheet-heading" name="attr_MovePU" style="width:40px">Move</th>
+							<td>
+								<input type="number" class="sheet-number" name="attr_PU-Move" value="(2)*(@{PU-total})" disabled="true"/>
+							</td>
+					</tr>
+					<tr>
+						<th type="text" class="sheet-heading" name="attr_SkillsPU" style="width:40px">Skills</th>
+							<td>
+								<input type="number" class="sheet-number" name="attr_PU-Skills" value="(2)*(@{PU-total})" disabled="true"/>
+							</td>
+					</tr>						
+				</table>
+		</div>
         
+		
+		
         <div class='sheet-col'>
             <h4>Hit Points & Chakra</h4>
             <table class="sheet-tableII">
@@ -1747,7 +1827,7 @@
                 </tr>
                 <tr>
                     <th><div class="sheet-font">Hit Points</div></th>
-                    <th><input type="number" class="sheet-ability" name="attr_HitPoints_max" title="@{HitPoints_max}" value="@{HitPoints-Class}+@{HitPoints-Ability}+@{HitPoints-Bonus}+@{HitPoints-Other}" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_HitPoints_max" title="@{HitPoints_max}" value="@{HitPoints-Class}+@{HitPoints-Ability}+@{HitPoints-Bonus}+@{HitPoints-Other}+(@{PU-hp})" disabled="true"/></th>
                     <td><input type="number" class="sheet-number" name="attr_HitPoints-Class" value="0"/></td>
                     <td><input type="number" class="sheet-number" name="attr_HitPoints-Ability" value="(@{HitPoints-Mod})*(@{Character_Level})" disabled='true'/>
                         <select class="sheet-number" name="attr_HitPoints-Mod" title="@{HitPoints-Mod}" style="width:95%">
@@ -1765,7 +1845,7 @@
                 </tr>
                 <tr>
                     <th><div class="sheet-font">Chakra Pool</div></th>
-                    <th><input type="number" class="sheet-ability" name="attr_ChakraPool_max" title="@{ChakraPool_max}" value="@{ChakraPool-Class}+@{ChakraPool-Ability}+@{ChakraPool-Bonus}+@{ChakraPool-Other}" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_ChakraPool_max" title="@{ChakraPool_max}" value="@{ChakraPool-Class}+@{ChakraPool-Ability}+@{ChakraPool-Bonus}+@{ChakraPool-Other}+@{PU-ChakraPool}" disabled="true"/></th>
                     <td><input type="number" class="sheet-number" name="attr_ChakraPool-Class" value="(@{Character_Level}+1)*2" disabled='true'/></td>
                     <td><input type="number" class="sheet-number" name="attr_ChakraPool-Ability" value="@{ChakraPool-Mod}*(@{Character_Level})" disabled='true'/>
                         <select class="sheet-number" name="attr_ChakraPool-Mod" title="@{ChakraPool-Mod}" style="width:95%">
@@ -1824,7 +1904,7 @@
                 </tr>
                 <tr>
                     <th><div class="sheet-font">Defense</div></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Defense_Normal" title="@{Defense}" value="@{Defense-Base_Normal} + @{Defense-Class_Normal} + @{Defense-Armor_Normal} + @{Defense-Dex_Normal} + @{Defense-Size_Normal} + @{Defense-Misc_Normal}" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Defense_Normal" title="@{Defense}" value="@{Defense-Base_Normal} + @{Defense-Class_Normal} + @{Defense-Armor_Normal} + @{Defense-Dex_Normal} + @{Defense-Size_Normal} + @{Defense-Misc_Normal} + @{PU-dodge}" disabled="true"/></th>
                     <td><input type="number" class="sheet-number" name="attr_Defense-Base_Normal" value="10" disabled="true"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Defense-Class_Normal" value="@{Class1-Defense} + @{Class2-Defense} + @{Class3-Defense} + @{Class4-Defense} + @{Class5-Defense} + @{Class6-Defense}" disabled="true"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Defense-Armor_Normal" value="@{Armor-Bonus}" disabled="true"/></td>
@@ -1849,7 +1929,7 @@
                 </tr>
                 <tr>
                     <th><div class="sheet-font">Touch</div></th>
-                    <th><input type="number" class="sheet-ability" name="attr_Defense_Touch" title="@{Defense_Touch}" value="@{Defense-Base_Touch} + @{Defense-Class_Touch} + @{Defense-Dex_Touch} + @{Defense-Size_Touch} + @{Defense-Misc_Touch}" disabled="true"/></th>
+                    <th><input type="number" class="sheet-ability" name="attr_Defense_Touch" title="@{Defense_Touch}" value="@{Defense-Base_Touch} + @{Defense-Class_Touch} + @{Defense-Dex_Touch} + @{Defense-Size_Touch} + @{Defense-Misc_Touch} + @{PU-dodge}" disabled="true"/></th>
                     <td><input type="number" class="sheet-number" name="attr_Defense-Base_Touch" value="10" disabled="true"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Defense-Class_Touch" value="@{Class1-Defense} + @{Class2-Defense} + @{Class3-Defense} + @{Class4-Defense} + @{Class5-Defense} + @{Class6-Defense}" disabled="true"/></td>
                     <td><input type="number" class="sheet-number" name="attr_Defense-Armor" value=" " disabled="true"/></td>
@@ -2175,7 +2255,7 @@
         </tr>
         <tr>
             <td><input type="number" class="sheet-number" name="attr_total-Character_Level" value="0" /></td>
-            <td><input type="text" class="sheet-number" name="attr_Affinity" value="" placeholder="Earth, Fire, Water, etc" style="width:200px"/></td>
+            <td><input type="text" class="sheet-number" name="attr_Affinity" value="" placeholder="Earth, Fire, Water, etc" style="width:275px"/></td>
             <td><input type="number" class="sheet-number" name="attr_Known" value="0" /></td>
             <td><input type="number" class="sheet-number" name="attr_ChakraPool-max" value="@{ChakraPool_max}" disabled='true' /></td>
             <td><input type="number" class="sheet-number" name="attr_ChakraPool-current" value="@{ChakraPool}" disabled='true' /></td>
@@ -2193,7 +2273,7 @@
             <th class="sheet-heading">Chakra Pool<br>Current</th>
         </tr>
         <tr>
-            <td><input type="number" class="sheet-number" name="attr_cc-Character_Level" title="@{cc-Character_Level}" value="0" /></td>
+            <td><input type="number" class="sheet-number" name="attr_cc-Character_Level" title="@{cc-Character_Level}" value="1" /></td>
             <td>
                 <select class="sheet-number" name="attr_cc-Attribute" title="@{cc-Attribute}" >
                     <option value="@{Strength-mod}">Strength</option>
@@ -2245,7 +2325,7 @@
         </tr>
         <tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Chakra_Control" value="/e rolls Chakra Control Learn [[1d20+@{Learn_Chakra_Control}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Chakra_Control" value="[[@{Learn_Chakra_Control-ability}+@{Learn_Chakra_Control-Ranks}+@{Learn_Chakra_Control-Blood}+@{Learn_Chakra_Control-Occu}+@{Learn_Chakra_Control-Feats}+@{Learn_Chakra_Control-Synergy}+@{Learn_Chakra_Control-Items}+@{Learn_Chakra_Control-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Chakra_Control" value="[[@{Learn_Chakra_Control-ability}+@{Learn_Chakra_Control-Ranks}+@{Learn_Chakra_Control-Blood}+@{Learn_Chakra_Control-Occu}+@{Learn_Chakra_Control-Feats}+@{Learn_Chakra_Control-Synergy}+@{Learn_Chakra_Control-Items}+@{Learn_Chakra_Control-Misc}+@{PU-learn}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Chakra_Control-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2326,6 +2406,7 @@
                             <td>
                                 <select class="sheet-number" name="attr_cc-TX-Range-Opt" title="@{cc-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='[[@{cc-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{cc-TX-Range} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] ft.'>Close</option>
                                     <option value='[[20 + (10*(0.5 * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] ft.'>Medium</option>
@@ -2474,6 +2555,7 @@
                             <td>
                                 <select class="sheet-number" name="attr_cc-TX-Range-Opt" title="@{cc-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='[[@{cc-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{cc-TX-Range} * (@{cc-Character_Level} + @{cc-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] ft.'>Close</option>
                                     <option value='[[20 + (10*(0.5 * (@{cc-Character_Level} + @{cc-TX-masLevel}) ) ) ]] ft.'>Medium</option>
@@ -2629,7 +2711,7 @@
         </tr>
         <tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Fuinjutsu" value="/e rolls Fuinjutsu Learn [[1d20+@{Learn_Fuinjutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Fuinjutsu" value="[[@{Learn_Fuinjutsu-ability}+@{Learn_Fuinjutsu-Ranks}+@{Learn_Fuinjutsu-Blood}+@{Learn_Fuinjutsu-Occu}+@{Learn_Fuinjutsu-Feats}+@{Learn_Fuinjutsu-Synergy}+@{Learn_Fuinjutsu-Items}+@{Learn_Fuinjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Fuinjutsu" value="[[@{Learn_Fuinjutsu-ability}+@{Learn_Fuinjutsu-Ranks}+@{Learn_Fuinjutsu-Blood}+@{Learn_Fuinjutsu-Occu}+@{Learn_Fuinjutsu-Feats}+@{Learn_Fuinjutsu-Synergy}+@{Learn_Fuinjutsu-Items}+@{Learn_Fuinjutsu-Misc}+@{PU-learn}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Fuinjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -2711,6 +2793,7 @@
                             <td>
                                 <select class="sheet-number" name="attr_fu-TX-Range-Opt" title="@{fu-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='[[@{fu-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{fu-TX-Range} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] ft.'>Close</option>
                                     <option value='[[20 + (10*(0.5 * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] ft.'>Medium</option>
@@ -2859,6 +2942,7 @@
                             <td>
                                 <select class="sheet-number" name="attr_fu-TX-Range-Opt" title="@{fu-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='[[@{fu-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{fu-TX-Range} * (@{fu-Character_Level} + @{fu-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] ft.'>Close</option>
                                     <option value='[[20 + (10*(0.5 * (@{fu-Character_Level} + @{fu-TX-masLevel}) ) ) ]] ft.'>Medium</option>
@@ -3015,7 +3099,7 @@
         </tr>
         <tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Genjutsu" value="/e rolls Genjutsu Learn [[1d20+@{Learn_Genjutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Genjutsu" value="[[@{Learn_Genjutsu-ability}+@{Learn_Genjutsu-Ranks}+@{Learn_Genjutsu-Blood}+@{Learn_Genjutsu-Occu}+@{Learn_Genjutsu-Feats}+@{Learn_Genjutsu-Synergy}+@{Learn_Genjutsu-Items}+@{Learn_Genjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Genjutsu" value="[[@{Learn_Genjutsu-ability}+@{Learn_Genjutsu-Ranks}+@{Learn_Genjutsu-Blood}+@{Learn_Genjutsu-Occu}+@{Learn_Genjutsu-Feats}+@{Learn_Genjutsu-Synergy}+@{Learn_Genjutsu-Items}+@{Learn_Genjutsu-Misc}+@{PU-learn}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Genjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -3096,6 +3180,7 @@
                             <td>
                                 <select class="sheet-number" name="attr_ge-TX-Range-Opt" title="@{ge-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='[[@{ge-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ge-TX-Range} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] ft.'>Close</option>
                                     <option value='[[20 + (10*(0.5 * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] ft.'>Medium</option>
@@ -3244,6 +3329,7 @@
                             <td>
                                 <select class="sheet-number" name="attr_ge-TX-Range-Opt" title="@{ge-TX-Range-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='[[@{ge-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ge-TX-Range} * (@{ge-Character_Level} + @{ge-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] ft.'>Close</option>
                                     <option value='[[20 + (10*(0.5 * (@{ge-Character_Level} + @{ge-TX-masLevel}) ) ) ]] ft.'>Medium</option>
@@ -3400,7 +3486,7 @@
         </tr>
         <tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Ninjutsu" value="/e rolls Ninjutsu Learn [[1d20+@{Learn_Ninjutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Ninjutsu" value="[[@{Learn_Ninjutsu-ability}+@{Learn_Ninjutsu-Ranks}+@{Learn_Ninjutsu-Blood}+@{Learn_Ninjutsu-Occu}+@{Learn_Ninjutsu-Feats}+@{Learn_Ninjutsu-Synergy}+@{Learn_Ninjutsu-Items}+@{Learn_Ninjutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Ninjutsu" value="[[@{Learn_Ninjutsu-ability}+@{Learn_Ninjutsu-Ranks}+@{Learn_Ninjutsu-Blood}+@{Learn_Ninjutsu-Occu}+@{Learn_Ninjutsu-Feats}+@{Learn_Ninjutsu-Synergy}+@{Learn_Ninjutsu-Items}+@{Learn_Ninjutsu-Misc}+@{PU-learn}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Ninjutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}">Str</option>
@@ -3481,6 +3567,7 @@
                             <td>
                                 <select class="sheet-number" name="attr_ni-TX-Ranni-Opt" title="@{ni-TX-Ranni-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='[[@{ni-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ni-TX-Range} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Close</option>
                                     <option value='[[20 + (10*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Medium</option>
@@ -3629,6 +3716,7 @@
                             <td>
                                 <select class="sheet-number" name="attr_ni-TX-Ranni-Opt" title="@{ni-TX-Ranni-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='[[@{ni-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ni-TX-Range} * (@{ni-Character_Level} + @{ni-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Close</option>
                                     <option value='[[20 + (10*(0.5 * (@{ni-Character_Level} + @{ni-TX-masLevel}) ) ) ]] ft.'>Medium</option>
@@ -3786,7 +3874,7 @@
         </tr>
         <tr>
             <td><button type="roll" class="sheet-btn" name="roll_Learn_Taijutsu" value="/e rolls Taijutsu Learn [[1d20+@{Learn_Taijutsu}]]" >Learn</button></td>
-            <td><input type="number" class="sheet-ability" name="attr_Learn_Taijutsu" value="[[@{Learn_Taijutsu-ability}+@{Learn_Taijutsu-Ranks}+@{Learn_Taijutsu-Blood}+@{Learn_Taijutsu-Occu}+@{Learn_Taijutsu-Feats}+@{Learn_Taijutsu-Synergy}+@{Learn_Taijutsu-Items}+@{Learn_Taijutsu-Misc}]]" disabled="true"/></td>
+            <td><input type="number" class="sheet-ability" name="attr_Learn_Taijutsu" value="[[@{Learn_Taijutsu-ability}+@{Learn_Taijutsu-Ranks}+@{Learn_Taijutsu-Blood}+@{Learn_Taijutsu-Occu}+@{Learn_Taijutsu-Feats}+@{Learn_Taijutsu-Synergy}+@{Learn_Taijutsu-Items}+@{Learn_Taijutsu-Misc}+@{PU-learn}]]" disabled="true"/></td>
             <td>
                 <select class="sheet-number" name="attr_Learn_Taijutsu-ability" style="width:40px;">
                     <option value="@{Strength-mod}"selected>Str</option>
@@ -3867,6 +3955,7 @@
                             <td>
                                 <select class="sheet-number" name="attr_ta-TX-Ranta-Opt" title="@{ta-TX-Ranta-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='[[@{ta-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ta-TX-Range} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] ft.'>Close</option>
                                     <option value='[[20 + (10*(0.5 * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] ft.'>Medium</option>
@@ -4015,6 +4104,7 @@
                             <td>
                                 <select class="sheet-number" name="attr_ta-TX-Ranta-Opt" title="@{ta-TX-Ranta-Opt}" style="width:50px">
                                     <option value="N/A" selected>N/A</option>
+									<option value='[[@{ta-TX-Range}]] ft.'>Feet</option>
                                     <option value='[[@{ta-TX-Range} * (@{ta-Character_Level} + @{ta-TX-masLevel}) ]] ft.'>Feet/Lvl</option>
                                     <option value='[[10 + (5*(0.5 * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] ft.'>Close</option>
                                     <option value='[[20 + (10*(0.5 * (@{ta-Character_Level} + @{ta-TX-masLevel}) ) ) ]] ft.'>Medium</option>