diff --git a/DnDNext_Actoba/DnDNext.html b/DnDNext_Actoba/DnDNext.html
index db10e3b9d1..927e80f2df 100644
--- a/DnDNext_Actoba/DnDNext.html
+++ b/DnDNext_Actoba/DnDNext.html
@@ -64,7 +64,7 @@
 					<div class="sheet-row">
 						<div class="sheet-col-1-3 sheet-center" title="This is a bonus for you being proficient in a given task.  This bonus automatically increases as you level up and is used automatically in various rolls"><input class="sheet-underlined" type="number" name="attr_PB" value="floor((@{Level}+5)/4)" disabled="true"  ><br/>Prof Bonus</div>
 						<div class="sheet-col-1-3 sheet-center" title="Only enter additional bonuses to initiative here. Your Dex mod is already included in the macro button"><input class="sheet-underlined" type="number" name="attr_Initiative" value="0"><br/>Init Bonus</div>
-						<div class="sheet-col-1-3 sheet-center"><button type='roll' name='roll_initiative' value='@{selected|token_name} rolls a [[1d20+@{selected|Initiative}+@{selected|DexMod}&{tracker}]] for initiative!'>Initiative</button></div>
+						<div class="sheet-col-1-3 sheet-center"><button type='roll' name='roll_initiative' value='@{selected|token_name} rolls a [[1d20 + @{selected|DexMod} [Dexterity Mod] + @{selected|Initiative} [Initiative Bonus] + &{tracker}]] for initiative!'>Initiative</button></div>
 					</div>
 					
 				</div>
@@ -86,8 +86,8 @@
 				<div class="sheet-col-1-6 sheet-core-stat-label">Str</div>
 				<div class="sheet-col-1-6"><input type="number" name="attr_StrMod" value="floor((@{strength}-10)/2)" disabled="true"/></div>
 				<div class="sheet-col-1-6 sheet-vert-middle sheet-core-checkbox-row"><input type="checkbox" name="attr_str_save_prof" value="@{PB}" /></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_str_save' value='/em attempts a saving throw\nSTR save throw : [[1d20 + @{StrMod} + @{str_save_prof} + ?{Misc Modifiers|0}]]'>Save</button></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_strength' value='/em makes an ability check\nSTR check : [[1d20+@{StrMod}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_str_save' value='/em attempts a saving throw\nSTR save throw : [[1d20 + @{StrMod} [Strength Mod] + @{str_save_prof} [Proficiency Bonus] + ?{Misc Modifiers|0} [Misc Modifiers] ]]'>Save</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_strength' value='/em makes an ability check\nSTR check : [[1d20 + @{StrMod} [Strength Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row">
@@ -95,8 +95,8 @@
 				<div class="sheet-col-1-6 sheet-core-stat-label">Dex</div>
 				<div class="sheet-col-1-6"><input type="number" name="attr_DexMod" value="floor((@{dexterity}-10)/2)" disabled="true"/></div>
 				<div class="sheet-col-1-6 sheet-vert-middle sheet-core-checkbox-row"><input type="checkbox" name="attr_dex_save_prof" value="@{PB}" /></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_str_save' value='/em attempts a saving throw\nDEX save throw : [[1d20 + @{DexMod} + @{dex_save_prof} + ?{Misc Modifiers|0}]]'>Save</button></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_dexterity' value='/em makes an ability check\nDEX check : [[1d20+@{DexMod}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_str_save' value='/em attempts a saving throw\nDEX save throw : [[1d20 + @{DexMod} [Dexterity Mod] + @{dex_save_prof} [Proficiency Bonus] + ?{Misc Modifiers|0} [Misc Modifiers] ]]'>Save</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_dexterity' value='/em makes an ability check\nDEX check : [[1d20 + @{DexMod} [Dexterity Mod ] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row">
@@ -104,8 +104,8 @@
 				<div class="sheet-col-1-6 sheet-core-stat-label">Con</div>
 				<div class="sheet-col-1-6"><input type="number" name="attr_ConMod" value="floor((@{constitution}-10)/2)" disabled="true"/></div>
 				<div class="sheet-col-1-6 sheet-vert-middle sheet-core-checkbox-row"><input type="checkbox" name="attr_con_save_prof" value="@{PB}" /></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_con_save' value='/em attempts a saving throw\nCON save throw : [[1d20 + @{ConMod} + @{con_save_prof} + ?{Misc Modifiers|0}]]'>Save</button></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_constitution' value='/em makes an ability check\nCON check : [[1d20+@{ConMod}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_con_save' value='/em attempts a saving throw\nCON save throw : [[1d20 + @{ConMod} [Constitution Modifier] + @{con_save_prof} [Proficiency Bonus] + ?{Misc Modifiers|0} [Misc Modifiers] ]]'>Save</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_constitution' value='/em makes an ability check\nCON check : [[1d20 + @{ConMod} [Constitution Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row">
@@ -113,8 +113,8 @@
 				<div class="sheet-col-1-6 sheet-core-stat-label">Int</div>
 				<div class="sheet-col-1-6"><input type="number" name="attr_IntMod" value="floor((@{intelligence}-10)/2)" disabled="true"/></div>
 				<div class="sheet-col-1-6 sheet-vert-middle sheet-core-checkbox-row"><input type="checkbox" name="attr_int_save_prof" value="@{PB}" /></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_int_save' value='/em attempts a saving throw\nINT save throw : [[1d20 + @{IntMod} + @{int_save_prof} + ?{Misc Modifiers|0}]]'>Save</button></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_intelligence' value='/em makes an ability check\nINT check : [[1d20+@{IntMod}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_int_save' value='/em attempts a saving throw\nINT save throw : [[1d20 + @{IntMod} [Intelligence Mod] + @{int_save_prof} [Proficiency Bonus] + ?{Misc Modifiers|0} [Misc Modifiers] ]]'>Save</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_intelligence' value='/em makes an ability check\nINT check : [[1d20 + @{IntMod} [Intelligence Mod] + ?{MiscMod|0}[Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row">
@@ -122,8 +122,8 @@
 				<div class="sheet-col-1-6 sheet-core-stat-label">Wis</div>
 				<div class="sheet-col-1-6"><input type="number" name="attr_WisMod" value="floor((@{wisdom}-10)/2)" disabled="true"/></div>
 				<div class="sheet-col-1-6 sheet-vert-middle sheet-core-checkbox-row"><input type="checkbox" name="attr_wis_save_prof" value="@{PB}" /></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_wis_save' value='/em attempts a saving throw\nWIS save throw : [[1d20 + @{WisMod} + @{wis_save_prof} + ?{Misc Modifiers|0}]]'>Save</button></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_wisdom' value='/em makes an ability check\nWIS check : [[1d20+@{WisMod}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_wis_save' value='/em attempts a saving throw\nWIS save throw : [[1d20 + @{WisMod} [Wisdom Mod] + @{wis_save_prof} [Proficiency Bonus] + ?{Misc Modifiers|0} [Misc Modifiers] ]]'>Save</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_wisdom' value='/em makes an ability check\nWIS check : [[1d20 + @{WisMod} [Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row">
@@ -131,8 +131,8 @@
 				<div class="sheet-col-1-6 sheet-core-stat-label">Cha</div>
 				<div class="sheet-col-1-6"><input type="number" name="attr_ChaMod" value="floor((@{charisma}-10)/2)" disabled="true"/></div>
 				<div class="sheet-col-1-6 sheet-vert-middle sheet-core-checkbox-row"><input type="checkbox" name="attr_cha_save_prof" value="@{PB}" /></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_cha_save' value='/em attempts a saving throw\nCHA save throw : [[1d20 + @{ChaMod} + @{cha_save_prof} + ?{Misc Modifiers|0}]]'>Save</button></div>
-				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_charisma' value='/em makes an ability check\nCHA check : [[1d20+@{ChaMod}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_cha_save' value='/em attempts a saving throw\nCHA save throw : [[1d20 + @{ChaMod} [Charisma Mod] + @{cha_save_prof} [Proficiency Bonus] + ?{Misc Modifiers|0} [Misc Modifiers] ]]'>Save</button></div>
+				<div class="sheet-col-1-6 sheet-center"><button type='roll' name='roll_basic_charisma' value='/em makes an ability check\nCHA check : [[1d20 + @{ChaMod} [Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<hr />
@@ -152,7 +152,7 @@
 								<option value="d12">d12 (Barbarian)</option>
 							</select>
 						</div>
-						<div class="sheet-col-1-15"><button type='roll' name='roll_HD_use' value='/em takes a rest\n[[1@{HD_type} + @{ConMod}]] HP recovered from resting (1@{HD_type}  hit dice used)'>Use</button></div>
+						<div class="sheet-col-1-15"><button type='roll' name='roll_HD_use' value='/em takes a rest\n[[1@{HD_type} + @{ConMod} [Constitution Mod] ]] HP recovered from resting (1@{HD_type}  hit dice used)'>Use</button></div>
 					</div>
 					
 					<div class="sheet-row sheet-footer-row sheet-grey-row">
@@ -172,7 +172,7 @@
 									<option value="d12">d12 (Barbarian)</option>
 								</select>
 							</div>
-							<div class="sheet-col-1-15"><button type='roll' name='roll_HDuse' value='/em takes a rest\n[[1@{HDtype} + @{ConMod}]] HP recovered from resting (1@{HDtype} hit dice used)'>Use</button></div>
+							<div class="sheet-col-1-15"><button type='roll' name='roll_HDuse' value='/em takes a rest\n[[1@{HDtype} + @{ConMod} [Constituiton Mod] ]] HP recovered from resting (1@{HDtype} hit dice used)'>Use</button></div>
 						</div>
 						
 						<div class="sheet-row sheet-footer-row sheet-grey-row">
@@ -223,7 +223,7 @@
 				<div class="sheet-col-1-3 sheet-vert-middle">Athletics</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-athletics" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-athletics" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_athletics" value="(@{pb-athletics}*@{PB})+@{StrMod}+@{ex-athletics}" class="sheet-short"><button class="sheet-skill-roll" type='roll' name='roll_athletics' value='/em makes an ability check\nSTR (Athletics) check :[[1d20+@{athletics}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_athletics" value="(@{pb-athletics}*@{PB})+@{StrMod}+@{ex-athletics}" class="sheet-short"><button class="sheet-skill-roll" type='roll' name='roll_athletics' value='/em makes an ability check\nSTR (Athletics) check :[[1d20 + @{athletics} [Proficiency + Expertise + Strength Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-header">
@@ -234,21 +234,21 @@
 				<div class="sheet-col-1-3 sheet-vert-middle">Acrobatics</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-acrobatics" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-acrobatics" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_acrobatics" value="(@{pb-acrobatics}*@{PB})+@{DexMod}+@{ex-acrobatics}"><button class="sheet-skill-roll" type='roll' name='roll_acrobatics' value='/em makes an ability check\nDEX (Acrobatics) check :[[1d20+@{acrobatics}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_acrobatics" value="(@{pb-acrobatics}*@{PB})+@{DexMod}+@{ex-acrobatics}"><button class="sheet-skill-roll" type='roll' name='roll_acrobatics' value='/em makes an ability check\nDEX (Acrobatics) check :[[1d20 + @{acrobatics} [Proficiency + Expertise + Dexterity Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Sleight of Hand</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-sleightofhand" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-sleightofhand" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_sleightofhand" value="(@{pb-sleightofhand}*@{PB})+@{DexMod}+@{ex-sleightofhand}"><button class="sheet-skill-roll" type='roll' name='roll_sleightofhand' value='/em makes an ability check\nDEX (Sleight of Hand) check :[[1d20+@{sleightofhand}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_sleightofhand" value="(@{pb-sleightofhand}*@{PB})+@{DexMod}+@{ex-sleightofhand}"><button class="sheet-skill-roll" type='roll' name='roll_sleightofhand' value='/em makes an ability check\nDEX (Sleight of Hand) check :[[1d20 + @{sleightofhand} [Proficiency + Expertise + Dexterity Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Stealth</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-stealth" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-stealth" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_stealth" value="(@{pb-stealth}*@{PB})+@{DexMod}+@{ex-stealth}"><button class="sheet-skill-roll" type='roll' name='roll_stealth' value='/em makes an ability check\nDEX (Stealth) check :[[1d20+@{stealth}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_stealth" value="(@{pb-stealth}*@{PB})+@{DexMod}+@{ex-stealth}"><button class="sheet-skill-roll" type='roll' name='roll_stealth' value='/em makes an ability check\nDEX (Stealth) check :[[1d20 + @{stealth} [Proficiency + Expertise + Dexterity Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-header">
@@ -259,35 +259,35 @@
 				<div class="sheet-col-1-3 sheet-vert-middle">Arcana</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-arcana" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-arcana" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_arcana" value="(@{pb-arcana}*@{PB})+@{IntMod}+@{ex-arcana}"><button class="sheet-skill-roll" type='roll' name='roll_arcana' value='/em makes an ability check\nINT (Arcana) check :[[1d20+@{arcana}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_arcana" value="(@{pb-arcana}*@{PB})+@{IntMod}+@{ex-arcana}"><button class="sheet-skill-roll" type='roll' name='roll_arcana' value='/em makes an ability check\nINT (Arcana) check :[[1d20 + @{arcana} [Proficiency + Expertise + Intelligence Mod] +?{MiscMod|0} [Misc Modifers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">History</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-history" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-history" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_history" value="(@{pb-history}*@{PB})+@{IntMod}+@{ex-history}"><button class="sheet-skill-roll" type='roll' name='roll_history' value='/em makes an ability check\nINT (History) check :[[1d20+@{history}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_history" value="(@{pb-history}*@{PB})+@{IntMod}+@{ex-history}"><button class="sheet-skill-roll" type='roll' name='roll_history' value='/em makes an ability check\nINT (History) check :[[1d20 + @{history} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Nature</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-nature" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-nature" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-6 sheet-vert-middle"><input type="hidden" name="attr_nature" value="(@{pb-nature}*@{PB})+@{IntMod}+@{ex-nature}"><button class="sheet-skill-roll" type='roll' name='roll_nature' value='/em makes an ability check\nINT (Nature) check :[[1d20+@{nature}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-6 sheet-vert-middle"><input type="hidden" name="attr_nature" value="(@{pb-nature}*@{PB})+@{IntMod}+@{ex-nature}"><button class="sheet-skill-roll" type='roll' name='roll_nature' value='/em makes an ability check\nINT (Nature) check :[[1d20 + @{nature} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Religion</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-religion" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-religion" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_religion" value="(@{pb-religion}*@{PB})+@{IntMod}+@{ex-religion}"><button class="sheet-skill-roll" type='roll' name='roll_religion' value='/em makes an ability check\nINT (Religion) check :[[1d20+@{religion}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_religion" value="(@{pb-religion}*@{PB})+@{IntMod}+@{ex-religion}"><button class="sheet-skill-roll" type='roll' name='roll_religion' value='/em makes an ability check\nINT (Religion) check :[[1d20 + @{religion} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Search</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-search" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-search" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_search" value="(@{pb-search}*@{PB})+@{IntMod}+@{ex-search}"><button class="sheet-skill-roll" type='roll' name='roll_search' value='/em makes an ability check\nINT (Search) check :[[1d20+@{search}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_search" value="(@{pb-search}*@{PB})+@{IntMod}+@{ex-search}"><button class="sheet-skill-roll" type='roll' name='roll_search' value='/em makes an ability check\nINT (Search) check :[[1d20 + @{search} [Proficiency + Expertise + Intelligence Mod] + ?{MiscMod|0} [Misc Modifers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-header">
@@ -298,35 +298,35 @@
 				<div class="sheet-col-1-3 sheet-vert-middle">Animal Handling</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-animalhandling" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-animalhandling" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_animalhandling" value="(@{pb-animalhandling}*@{PB})+@{WisMod}+@{ex-animalhandling}"><button class="sheet-skill-roll" type='roll' name='roll_animalhandling' value='/em makes an ability check\nWIS (Animal Handling) check :[[1d20+@{animalhandling}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_animalhandling" value="(@{pb-animalhandling}*@{PB})+@{WisMod}+@{ex-animalhandling}"><button class="sheet-skill-roll" type='roll' name='roll_animalhandling' value='/em makes an ability check\nWIS (Animal Handling) check :[[1d20 + @{animalhandling} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Insight</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-insight" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-insight" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_insight" value="(@{pb-insight}*@{PB})+@{WisMod}+@{ex-insight}"><button class="sheet-skill-roll" type='roll' name='roll_insight' value='/em makes an ability check\nWIS (Insight) check :[[1d20+@{insight}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_insight" value="(@{pb-insight}*@{PB})+@{WisMod}+@{ex-insight}"><button class="sheet-skill-roll" type='roll' name='roll_insight' value='/em makes an ability check\nWIS (Insight) check :[[1d20 + @{insight} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Medicine</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-medicine" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-medicine" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_medicine" value="(@{pb-medicine}*@{PB})+@{WisMod}+@{ex-medicine}"><button class="sheet-skill-roll" type='roll' name='roll_medicine' value='/em makes an ability check\nWIS (Medicine) check :[[1d20+@{medicine}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_medicine" value="(@{pb-medicine}*@{PB})+@{WisMod}+@{ex-medicine}"><button class="sheet-skill-roll" type='roll' name='roll_medicine' value='/em makes an ability check\nWIS (Medicine) check :[[1d20 + @{medicine} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Perception</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-perception" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-perception" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_perception" value="(@{pb-perception}*@{PB})+@{WisMod}+@{ex-perception}"><button class="sheet-skill-roll" type='roll' name='roll_perception' value='/em makes an ability check\nWIS (Perception) check :[[1d20+@{perception}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_perception" value="(@{pb-perception}*@{PB})+@{WisMod}+@{ex-perception}"><button class="sheet-skill-roll" type='roll' name='roll_perception' value='/em makes an ability check\nWIS (Perception) check :[[1d20 + @{perception} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Survival</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-survival" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-survival" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_survival" value="(@{pb-survival}*@{PB})+@{WisMod}+@{ex-survival}"><button class="sheet-skill-roll" type='roll' name='roll_survival' value='/em makes an ability check\nWIS (Survival) check :[[1d20+@{survival}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_survival" value="(@{pb-survival}*@{PB})+@{WisMod}+@{ex-survival}"><button class="sheet-skill-roll" type='roll' name='roll_survival' value='/em makes an ability check\nWIS (Survival) check :[[1d20 + @{survival} [Proficiency + Expertise + Wisdom Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-header">
@@ -337,28 +337,28 @@
 				<div class="sheet-col-1-3 sheet-vert-middle">Deception</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-deception" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-deception" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_deception" value="(@{pb-deception}*@{PB})+@{ChaMod}+@{ex-deception}"><button class="sheet-skill-roll" type='roll' name='roll_deception' value='/em makes an ability check\nCHA (Deception) check :[[1d20+@{deception}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_deception" value="(@{pb-deception}*@{PB})+@{ChaMod}+@{ex-deception}"><button class="sheet-skill-roll" type='roll' name='roll_deception' value='/em makes an ability check\nCHA (Deception) check :[[1d20 + @{deception} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Intimidation</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-intimidation" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-intimidation" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_intimidation" value="(@{pb-intimidation}*@{PB})+@{ChaMod}+@{ex-intimidation}"><button class="sheet-skill-roll" type='roll' name='roll_intimidation' value='/em makes an ability check\nCHA (Intimidation) check :[[1d20+@{intimidation}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_intimidation" value="(@{pb-intimidation}*@{PB})+@{ChaMod}+@{ex-intimidation}"><button class="sheet-skill-roll" type='roll' name='roll_intimidation' value='/em makes an ability check\nCHA (Intimidation) check :[[1d20 + @{intimidation} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Performance</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-performance" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-performance" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_performance" value="(@{pb-performance}*@{PB})+@{ChaMod}+@{ex-performance}"><button class="sheet-skill-roll" type='roll' name='roll_performance' value='/em makes an ability check\nCHA (Performance) check :[[1d20+@{performance}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_performance" value="(@{pb-performance}*@{PB})+@{ChaMod}+@{ex-performance}"><button class="sheet-skill-roll" type='roll' name='roll_performance' value='/em makes an ability check\nCHA (Performance) check :[[1d20 + @{performance} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 			
 			<div class="sheet-row sheet-skill-row">
 				<div class="sheet-col-1-3 sheet-vert-middle">Persuasion</div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_pb-persuasion" value="1"/>Prof</span></div>
 				<div class="sheet-col-1-6 sheet-vert-middle"><span><input type="checkbox" name="attr_ex-persuasion" value="5"/>Exp</span></div>
-				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_persuasion" value="(@{pb-persuasion}*@{PB})+@{ChaMod}+@{ex-persuasion}"><button class="sheet-skill-roll" type='roll' name='roll_persuasion' value='/em makes an ability check\nCHA (Persuasion) check :[[1d20+@{persuasion}+?{MiscMod|0}]]'>Check</button></div>
+				<div class="sheet-col-1-3 sheet-vert-middle"><input type="hidden" name="attr_persuasion" value="(@{pb-persuasion}*@{PB})+@{ChaMod}+@{ex-persuasion}"><button class="sheet-skill-roll" type='roll' name='roll_persuasion' value='/em makes an ability check\nCHA (Persuasion) check :[[1d20 + @{persuasion} [Proficiency + Expertise + Charisma Mod] + ?{MiscMod|0} [Misc Modifiers] ]]'>Check</button></div>
 			</div>
 		
 		</div>
@@ -418,8 +418,8 @@
 			<div class="sheet-col-1-6"><input type="text" name="attr_simpleattackdmgtype"></div>
 			<div class="sheet-col-1-12"><input type="text" name="attr_simpleattackrange"></div>
 			<div class="sheet-col-1-12" title="The magic bonus will be added as a bonus to BOTH the attack and damage rolls"><input type="number" name="attr_simpleattackmagic" value="0"></div>
-			<div class="sheet-col-1-12"><button type='roll' name='roll_simpleattack' value='/em uses @{simpleattackname} to attack\n[[1d20+@{simpleattackstat}+@{PB}+@{simpleattackmagic}+?{MiscMod|0}]] vs AC' >Attack</button></div>
-			<div class="sheet-col-1-12"><button type='roll' name='roll_simpleattackdamage' value='@{simpleattackname} hits for [[@{simpleattackdmg}+@{simpleattackdmgstat}+@{simpleattackmagic}+?{MiscMod|0}]] @{simpleattackdmgtype} damage'>Damage</button></div>
+			<div class="sheet-col-1-12"><button type='roll' name='roll_simpleattack' value='/em uses @{simpleattackname} to attack\n[[1d20 + @{simpleattackstat} [Attack Stat Mod] + @{PB} [Proficiency Bonus] + @{simpleattackmagic} [Magic Bonus] + ?{MiscMod|0} [Misc Modifiers] ]] vs AC' >Attack</button></div>
+			<div class="sheet-col-1-12"><button type='roll' name='roll_simpleattackdamage' value='@{simpleattackname} hits for [[@{simpleattackdmg} [Base damage] + @{simpleattackdmgstat} [Damage Stat Mod] + @{simpleattackmagic} [Magic Bonus] + ?{MiscMod|0} [Misc Modifiers] ]] @{simpleattackdmgtype} damage'>Damage</button></div>
 		</div>
 	</fieldset>
 	
@@ -474,7 +474,7 @@
 				<div class="sheet-col-5-13"><textarea class="sheet-fluid-textarea" name="attr_savethrowfailedsave"></textarea></div>
 				<div class="sheet-col-1-13 sheet-vert-middle">Successful Save</div>
 				<div class="sheet-col-5-13"><textarea class="sheet-fluid-textarea" name="attr_savethrowsuccesssave"></textarea></div>
-				<div class="sheet-col-1-13 sheet-vert-middle sheet-center"><button type='roll' name='roll_savethrowattack' value="/em uses @{savethrowattackname} to attack \nTarget must make a DC [[@{savethrowsavedc} + @{savethrowcustomdc}]] @{savethrowsavestat} saving throw.....On a failed save : @{savethrowfailedsave}....On a successful save : @{savethrowsuccesssave}" >Use</button></div>
+				<div class="sheet-col-1-13 sheet-vert-middle sheet-center"><button type='roll' name='roll_savethrowattack' value="/em uses @{savethrowattackname} to attack \nDC [[@{savethrowsavedc} + @{savethrowcustomdc}]] @{savethrowsavestat} saving throw\nOn a failed save : @{savethrowfailedsave}\nOn a successful save : @{savethrowsuccesssave}" >Use</button></div>
 				
 			</div>