diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
index 932cf9e4e..68cab4fd0 100644
--- a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
@@ -106,7 +106,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
     private int                                mPrevious;
     private OnChangedListener                  mListener;
     private Formatter                          mFormatter;
-    private long                               mSpeed              = 500;
+    private long                               mSpeed              = 300;
 
     private boolean                            mIncrement;
     private boolean                            mDecrement;
@@ -179,6 +179,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
 
     public void setFormatter(Formatter formatter) {
         mFormatter = formatter;
+        updateView();
     }
 
     /**
@@ -271,7 +272,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
         if (mListener != null) {
             return mListener.onChanged(this, mCurrent, current);
         } else
-            return mCurrent;
+            return current;
 
     }
 
diff --git a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
index c1324c3f7..49bffa78e 100644
--- a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
@@ -72,7 +72,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
                     if(hourPicker.getCurrent() == 0)
                         return 0;
                     hourPicker.setCurrent(hourPicker.getCurrent() - 1);
-                    return 60 - newVal;
+                    return 60 + newVal;
                 } else if(newVal > 59) {
                     hourPicker.setCurrent(hourPicker.getCurrent() + 1);
                     return newVal % 60;