diff --git a/IOSKnobControl.m b/IOSKnobControl.m
index 59fb9c2..c11ba07 100644
--- a/IOSKnobControl.m
+++ b/IOSKnobControl.m
@@ -356,10 +356,14 @@ - (NSInteger)positionIndex
 {
     if (self.mode == IKCMContinuous) return -1;
 
+    if (!_circular && _position == _max) {
+        return _positions - 1;
+    }
+
     float converted = self.position;
     if (converted < 0) converted += 2.0*M_PI;
 
-    int index = self.circular ? converted*0.5/M_PI*self.positions+0.5 : (self.position-self.min)/(self.max-self.min)*self.positions-0.5;
+    int index = self.circular ? converted*0.5/M_PI*self.positions+0.5 : (self.position-self.min)/(self.max-self.min)*self.positions;
 
     while (index >= self.positions) index -= self.positions;
     while (index < 0) index += self.positions;
@@ -461,17 +465,19 @@ - (double)polarAngleOfPoint:(CGPoint)point
  */
 - (float)nearestPosition
 {
-    float range = self.circular ? 2.0*M_PI : self.max - self.min;
-    float position = self.positionIndex*range/self.positions;
-    if (2*self.positionIndex == self.positions && self.circular == YES) {
-        /*
-         * Try to keep things confined to (-M_PI,M_PI] and avoid a return to -M_PI.
-         * This only happens when circular is YES.
-         * https://github.com/jdee/ios-knob-control/issues/7
-         */
-        return M_PI - IKC_EPSILON;
+    if (_circular) {
+        if (2*self.positionIndex == self.positions) {
+            /*
+             * Try to keep things confined to (-M_PI,M_PI] and avoid a return to -M_PI.
+             * This only happens when circular is YES.
+             * https://github.com/jdee/ios-knob-control/issues/7
+             */
+            return M_PI - IKC_EPSILON;
+        }
+        return self.positionIndex*2.0*M_PI/_positions;
     }
-    return position;
+
+    return ((_max-_min)/_positions)*(self.positionIndex+0.5) + _min;
 }
 
 #pragma mark - Private Methods: Animation
@@ -857,13 +863,15 @@ - (CGFloat)fontSizeForTitles
     CGFloat fontSize;
     CGFloat fontSizes[] = { 36.0, 24.0, 18.0, 14.0, 12.0, 10.0 };
 
+    double angle = _circular ? 2.0*M_PI : _max - _min;
+
     int index;
     for (index=0; index<sizeof(fontSizes)/sizeof(CGFloat); ++index) {
         fontSize = fontSizes[index];
         CGFloat circumference = [self titleCircumferenceWithFontSize:fontSize];
 
-        // Empirically, this 0.5 works out well. This allows for a little padding between text segments.
-        if (circumference <= M_PI*self.bounds.size.width*0.5) break;
+        // Empirically, this 0.25 works out well. This allows for a little padding between text segments.
+        if (circumference <= angle*self.bounds.size.width*0.25) break;
     }
 
     return fontSize;
diff --git a/KnobControlDemo/KCDImageViewController.m b/KnobControlDemo/KCDImageViewController.m
index b80807b..23b491c 100644
--- a/KnobControlDemo/KCDImageViewController.m
+++ b/KnobControlDemo/KCDImageViewController.m
@@ -41,6 +41,9 @@ - (void)viewDidLoad
     knobControl.positions = 3;
     knobControl.titles = titles;
     knobControl.timeScale = 0.5;
+    knobControl.circular = NO;
+    knobControl.min = -M_PI/2.0;
+    knobControl.max = M_PI/2.0;
 
     // tint and title colors
     UIColor* titleColor = [UIColor whiteColor];