diff --git a/ChangeLog b/ChangeLog
index 4be98d8d4..58be6e8e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-01-22 13:04  Alexander Malmberg <alexander@malmberg.org>
+
+	* Headers/Additions/GNUstepGUI/GSDrawFunctions.h: Add missing
+	include guards.
+
+	* Source/GSDrawFunctions.m: Correct misspellings and clarify the
+	documentation.
+
 2004-01-22 12:16  Alexander Malmberg <alexander@malmberg.org>
 
 	* Model/GMAppKit.m ([NSFont +createObjectForModelUnarchiver:]):
diff --git a/Headers/Additions/GNUstepGUI/GSDrawFunctions.h b/Headers/Additions/GNUstepGUI/GSDrawFunctions.h
index a794b6938..05e0cfdb0 100644
--- a/Headers/Additions/GNUstepGUI/GSDrawFunctions.h
+++ b/Headers/Additions/GNUstepGUI/GSDrawFunctions.h
@@ -24,6 +24,9 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
    */
 
+#ifndef _GNUstep_H_GSDrawFunctions
+#define _GNUstep_H_GSDrawFunctions
+
 #include <Foundation/NSGeometry.h>
 
 @class NSColor;
@@ -34,6 +37,9 @@
 + (void) drawDarkBezel: (NSRect)border : (NSRect)clip;
 + (void) drawLightBezel: (NSRect) border : (NSRect)clip;
 + (void) drawGroove: (NSRect)border : (NSRect)clip;
-+ (void) drawFramePhoto: (NSRect) border : (NSRect)clip;
++ (void) drawFramePhoto: (NSRect)border : (NSRect)clip;
 
 @end
+
+#endif /* _GNUstep_H_GSDrawFunctions */
+
diff --git a/Source/GSDrawFunctions.m b/Source/GSDrawFunctions.m
index 80c0039c2..0bb3a8a5e 100644
--- a/Source/GSDrawFunctions.m
+++ b/Source/GSDrawFunctions.m
@@ -36,14 +36,14 @@
   <heading>Class Description</heading>
   <p>
   This is a simple class used for encapsulating common drawing behaviors.
-  These methods stndardize drawing of buttons, borders and other common
-  gui elements. The drawing functions are encapsulated in a class to 
-  allow overridding of the methods so that these elements can be drawn
+  These methods standardize drawing of buttons, borders and other common
+  GUI elements. The drawing functions are encapsulated in a class to
+  allow overriding of the methods so that these elements can be drawn
   in different ways (e.g. with themes).
   </p>
   <p>
-  All the methods use the standard configurable colors defined in NSColor,
-  such as <code>controlLightHighlightColor</code>, 
+  The default implementation uses the standard configurable colors defined in 
+  NSColor, such as <code>controlLightHighlightColor</code>,
   <code>controlShadowColor</code> and  <code>controlDarkShadowColor</code>.
   </p>
   </unit>