diff --git a/ChangeLog b/ChangeLog
index 57914c5ef..9c51f9efa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-26  Werner Lemberg  <wl@gnu.org>
+
+	* src/pshinter/pshglob.c (psh_globals_new): Fix value of
+	`dim->stdw.count'.
+	Don't assign default values to blue scale and blue shift.
+
 2004-02-25  Werner Lemberg  <wl@gnu.org>
 
 	* docs/CHANGES: Updated.
diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c
index 43e38d98b..a2f61f55b 100644
--- a/src/pshinter/pshalgo.c
+++ b/src/pshinter/pshalgo.c
@@ -1321,8 +1321,8 @@
       ;
     }
 
-    /* for each extrema, determine its direction along the */
-    /* orthogonal axis                                     */
+    /* for each extremum, determine its direction along the */
+    /* orthogonal axis                                      */
     for ( n = 0; n < glyph->num_points; n++ )
     {
       PSH_Point  point, before, after;
@@ -1554,8 +1554,8 @@
       }
     }
 
-    /* now, certain points may have been attached to hint and */
-    /* not marked as strong; update their flags then          */
+    /* now, certain points may have been attached to a hint and */
+    /* not marked as strong; update their flags then            */
     {
       FT_UInt    count = glyph->num_points;
       PSH_Point  point = glyph->points;
@@ -1626,7 +1626,7 @@
   {
 
 #if 1
-    /* first technique: a point is strong if it is a local extrema */
+    /* first technique: a point is strong if it is a local extremum */
 
     PSH_Dimension  dim   = &glyph->globals->dimension[dimension];
     FT_Fixed       scale = dim->scale_mult;
@@ -1640,7 +1640,7 @@
       if ( psh_point_is_strong( point ) )
         continue;
 
-      /* sometimes, some local extremas are smooth points */
+      /* sometimes, some local extrema are smooth points */
       if ( psh_point_is_smooth( point ) )
       {
         if ( point->dir_in == PSH_DIR_NONE   ||
@@ -1671,7 +1671,7 @@
         {
           if ( psh_point_is_strong( cur ) )
           {
-            FT_Pos  diff = cur->org_u - u;;
+            FT_Pos  diff = cur->org_u - u;
 
 
             if ( diff <= 0 )
diff --git a/src/pshinter/pshglob.c b/src/pshinter/pshglob.c
index a2edd0c6a..812713ea1 100644
--- a/src/pshinter/pshglob.c
+++ b/src/pshinter/pshglob.c
@@ -421,7 +421,7 @@
 
 
       while ( threshold > 0 && FT_MulFix( threshold, scale ) > 32 )
-        threshold --;
+        threshold--;
 
       blues->blue_threshold = threshold;
     }
@@ -539,7 +539,7 @@
 
     no_shoots = blues->no_overshoots;
 
-    /* lookup stem top in top zones table */
+    /* look up stem top in top zones table */
     table = &blues->normal_top;
     count = table->count;
     zone  = table->zones;
@@ -653,7 +653,7 @@
           read++;
         }
 
-        dim->stdw.count = priv->num_snap_widths;
+        dim->stdw.count = priv->num_snap_widths + 1;
       }
 
       /* copy standard heights */
@@ -672,7 +672,7 @@
           read++;
         }
 
-        dim->stdw.count = priv->num_snap_heights;
+        dim->stdw.count = priv->num_snap_heights + 1;
       }
 
       /* copy blue zones */
@@ -684,15 +684,9 @@
                            priv->family_blues, priv->num_family_other_blues,
                            priv->family_other_blues, priv->blue_fuzz, 1 );
 
-      globals->blues.blue_scale = priv->blue_scale
-                                  ? priv->blue_scale
-                                  : 0x27A000L; /* 0.039625 * 0x10000 * 1000 */
-
-      globals->blues.blue_shift = priv->blue_shift
-                                  ? priv->blue_shift
-                                  : 7;
-
-      globals->blues.blue_fuzz = priv->blue_fuzz;
+      globals->blues.blue_scale = priv->blue_scale;
+      globals->blues.blue_shift = priv->blue_shift;
+      globals->blues.blue_fuzz  = priv->blue_fuzz;
 
       globals->dimension[0].scale_mult  = 0;
       globals->dimension[0].scale_delta = 0;