diff --git a/ExaltedDice/res/values/strings.xml b/ExaltedDice/res/values/strings.xml
index 34590bb..90fc667 100755
--- a/ExaltedDice/res/values/strings.xml
+++ b/ExaltedDice/res/values/strings.xml
@@ -27,5 +27,10 @@
     <string name="calc_successes">Calculate Successes</string>
     <string name="calc_successes_summary">Calculates the total amount of success for each roll</string>
     <string name="total_plus_mod">\nTotal + Mod: </string>
+    <string name="tens_count_twice_msg">10 counts as two successes</string>
+    <string name="successes">Successes</string>
+    <string name="tens_count_twice">Tens count twice</string>
+    <string name="roll_mod">Roll Modifier</string>
+    <string name="roll_mod_msg">Calculate Roll + Modifier</string>
 
 </resources>
\ No newline at end of file
diff --git a/ExaltedDice/res/xml/settings.xml b/ExaltedDice/res/xml/settings.xml
index 3667b1c..7f153aa 100644
--- a/ExaltedDice/res/xml/settings.xml
+++ b/ExaltedDice/res/xml/settings.xml
@@ -6,10 +6,25 @@
         android:key="roll_again"
         android:summary="@string/roll_again_summary"
         android:title="@string/roll_again" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="roll_mod"
+        android:summary="@string/roll_mod_msg"
+        android:title="@string/roll_mod" />
+
+    <PreferenceCategory android:title="@string/successes" >
+    </PreferenceCategory>
+
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="calc_successes"
         android:title="@string/calc_successes" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:dependency="calc_successes"
+        android:key="tens_count_twice"
+        android:summary="@string/tens_count_twice_msg"
+        android:title="@string/tens_count_twice" />
 
     <PreferenceCategory android:title="@string/contact_us" >
         <Preference
diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java
index 0ff8aab..0c85291 100755
--- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java
+++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/ExaltedDice.java
@@ -66,7 +66,7 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
 			mDPicker.setValue(parseD(roll.getAsString(Database.KEY_D_TYPE)));
 			mModPicker.setValue(parseMod(roll.getAsString(Database.KEY_MOD).replace("'", "")));
 		} catch(NullPointerException e){
-			mModPicker.setValue(parseMod("0"));
+			mModPicker.setValue(parseMod("+0"));
 		}
 	}
 	
@@ -258,6 +258,13 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
 	protected void onResume() {
 		refresh();
 		applyRollPresets(mDb.getGameRollCount(mGameId));
+		
+		if(mSettings.getBoolean(Settings.KEY_ROLL_MOD, true)){
+			mModPicker.setVisibility(View.VISIBLE);
+		} else {
+			mModPicker.setVisibility(View.GONE);
+			mModPicker.setValue(parseMod("+0"));
+		}
 		super.onResume();
 	}
 
@@ -366,7 +373,8 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
 
 		resultsString.append(getString(R.string.total)+ total);
 		
-		resultsString.append(getString(R.string.total_plus_mod)+ (total + Integer.parseInt(mModValues[mModPicker.getValue()].replace("+", ""))));
+		if(mSettings.getBoolean(Settings.KEY_ROLL_MOD, true))
+			resultsString.append(getString(R.string.total_plus_mod)+ (total + Integer.parseInt(mModValues[mModPicker.getValue()].replace("+", ""))));
 		
 		if(mSettings.getBoolean(Settings.KEY_CALC_SUCCESSES, true))
 			resultsString.append(getString(R.string.sucesses)+ successes(roll));
@@ -436,8 +444,9 @@ public class ExaltedDice extends Activity implements OnClickListener, OnItemClic
 		for (int i = 0; i < roll.length; i++) {
 			if (roll[i] >= 7)
 				intSuccesses++;
-			if (roll[i] == 10)
-				intSuccesses++;
+			if(mSettings.getBoolean(Settings.KEY_TENS_COUNT_TWICE, true))
+				if (roll[i] == 10)
+					intSuccesses++;
 		}
 		return intSuccesses;
 	}
diff --git a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java
index 71072aa..1714905 100644
--- a/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java
+++ b/ExaltedDice/src/com/TwentyCode/android/ExaltedDice/Settings.java
@@ -32,8 +32,8 @@ public class Settings extends PreferenceActivity implements OnPreferenceClickLis
 	
 	public static final String KEY_ROLL_AGAIN = "roll_again";
 	public static final String KEY_CALC_SUCCESSES = "calc_successes";
-//	public static final String KEY_ = "";
-//	public static final String KEY_ = "";
+	public static final String KEY_TENS_COUNT_TWICE = "tens_count_twice";
+	public static final String KEY_ROLL_MOD = "roll_mod";
 //	public static final String KEY_ = "";
 //	public static final String KEY_ = "";
 //	public static final String KEY_ = "";