diff --git a/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.css b/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.css
index 6a299c4ab0..0b8377e0f0 100644
--- a/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.css
+++ b/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.css
@@ -184,6 +184,7 @@
 .charsheet textarea {
     width:calc(100% - 15px);
     height:auto;
+    text-align:left;
 }
 
 .charsheet label {
diff --git a/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.html b/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.html
index a3fe99052d..cbbd2607bf 100644
--- a/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.html
+++ b/StarWarsEdgeOfTheEmpire_Dice/EotE-Dice.html
@@ -8,21 +8,21 @@
                 <tr>
                     <td>
                         <label class="sheet-label-title">Soak</label>
-                        <input name="attr_Soak" type="number" max="99" min="-99" value="0"/>
+                        <input name="attr_soak" type="number" max="99" min="-99" value="0"/>
                     </td>
                     <td></td>
                     <td>
                         <label class="sheet-label-title">Wounds</label>
-                        <input name="attr_Wounds_max" type="number" max="99" min="-99" value="0"/>
-                        <input name="attr_Wounds" type="number" max="99" min="-99" value="0"/><br/>
+                        <input name="attr_wounds_max" type="number" max="99" min="-99" value="0"/>
+                        <input name="attr_wounds" type="number" max="99" min="-99" value="0"/><br/>
                         <label class="sheet-label-thershold">Thershold</label>
                         <label class="sheet-label-current">Current</label>
                     </td>
                     <td></td>
                     <td>
                         <label class="sheet-label-title">Strain</label>
-                        <input name="attr_Strain_max type="number" max="99" min="-99" value="0"/>
-                        <input name="attr_Strain" type="number" max="99" min="-99" value="0"/><br/>
+                        <input name="attr_strain_max" type="number" max="99" min="-99" value="0"/>
+                        <input name="attr_strain" type="number" max="99" min="-99" value="0"/><br/>
                         <label class="sheet-label-thershold">Thershold</label>
                         <label class="sheet-label-current">Current</label>    
                     </td>
@@ -714,7 +714,7 @@
                     <tr>
                         <td style="width:40%"><input type="text" name="attr_talentname"/></td>
                         <td style="width:10%"><input type="text" name="attr_talentpagenum"/></td>
-                        <td style="width:50%"><input type="text" name="attr_talentsummary"/></td>
+                        <td style="width:50%"><textarea rows="2" type="text" name="attr_talentsummary"/></textarea></td>
                     </tr>
                 </tbody>
             </table>
@@ -741,7 +741,7 @@
         
         <h3>Weapons</h3><br/>
         
-        <fieldset class="repeating_skills">
+        <fieldset class="repeating_weapons">
             
             <table class="sheet-weapons" cellspacing="0" cellpadding="0" border="0">
                 <tbody>
@@ -749,22 +749,22 @@
                         <td></td>
                         <td>
                             <label>Damage</label>
-                            <input name='attr_damage' type="number" max="9" min="0" value="0"/>
+                            <input name='attr_damage' type="number" max="99" min="0" value="0"/>
                         </td>
                         <td></td>
                         <td>
                             <label>Critical</label>
-                            <input name='attr_critical' type="number" max="9" min="0" value="0"/>
+                            <input name='attr_critical' type="number" max="99" min="0" value="0"/>
                         </td>
                         <td><button type='roll' name='roll_weapon' value='!eed @{weaponskill} @{weaponcondition} @{dicePool}'></button></td>
                         <td>
                             <label>Encum</label>
-                            <input name='attr_encum' type="number" max="9" min="0" value="0"/>
+                            <input name='attr_encum' type="number" max="99" min="0" value="0"/>
                         </td>
                         <td></td>
                         <td>
                             <label>HP</label>
-                            <input name='attr_hp' type="number" max="9" min="0" value="0"/>
+                            <input name='attr_hp' type="number" max="99" min="0" value="0"/>
                         </td>
                         <td></td>
                     </tr>
@@ -794,7 +794,7 @@
                              <select name='attr_weaponskill'>
                                 <option value="skill(@{rankBrawl}|@{brawn})">Brawl</option>
                                 <option value="skill(@{rankGunnery}|@{agility})">Gunnery</option>
-                                <option value="skill(@{rankMelee}|@{brawn})">Melee</option><!-- fixed roll -->
+                                <option value="skill(@{rankMelee}|@{brawn})">Melee</option>
                                 <option value="skill(@{rankLight}|@{agility})">Ranged - Light</option>
                                 <option value="skill(@{rankHeavy}|@{agility})">Ranged - Heavy</option>
                             </select> 
@@ -871,9 +871,7 @@
             <tbody>
                 <tr>
                     <td>
-                        <textarea rows="5" name="attr_armor">
-                            
-                        </textarea>
+                        <textarea rows="5" name="attr_armor"></textarea>
                     </td>
                 </tr>
             </tbody>
@@ -889,9 +887,7 @@
             <tbody>
                 <tr>
                     <td>
-                        <textarea rows="5" name="attr_personalgear">
-                            
-                        </textarea>    
+                        <textarea rows="5" name="attr_personalgear"></textarea>    
                     </td>
                 </tr>
             </tbody>
@@ -907,9 +903,7 @@
             <tbody>
                 <tr>
                     <td>
-                        <textarea rows="5" name="attr_assets">
-                            
-                        </textarea>    
+                        <textarea rows="5" name="attr_assets"></textarea>    
                     </td>
                 </tr>
             </tbody>