diff --git a/src/java/org/apache/commons/lang/time/CalendarUtils.java b/src/java/org/apache/commons/lang/time/CalendarUtils.java
index 22b20691d..d85c0f527 100644
--- a/src/java/org/apache/commons/lang/time/CalendarUtils.java
+++ b/src/java/org/apache/commons/lang/time/CalendarUtils.java
@@ -1,9 +1,7 @@
-package org.apache.commons.lang.time;
-
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,6 +51,7 @@ package org.apache.commons.lang.time;
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
+package org.apache.commons.lang.time;
 
 import java.text.*;
 import java.util.*;
@@ -61,6 +60,8 @@ import java.util.*;
  * A suite of utilities surrounding the use of the Calendar and Date object.
  *
  * @author <a href="mailto:sergek@lokitech.com">Serge Knystautas</a>
+ * @since 2.1
+ * @version $Id: CalendarUtils.java,v 1.2 2003/02/04 22:19:33 scolebourne Exp $
  */
 public class CalendarUtils {
 
diff --git a/src/java/org/apache/commons/lang/time/DateUtils.java b/src/java/org/apache/commons/lang/time/DateUtils.java
index 2094df837..8364a4d1c 100644
--- a/src/java/org/apache/commons/lang/time/DateUtils.java
+++ b/src/java/org/apache/commons/lang/time/DateUtils.java
@@ -1,7 +1,7 @@
-/*
+/* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,14 +23,14 @@
  *    Alternately, this acknowlegement may appear in the software itself,
  *    if and wherever such third-party acknowlegements normally appear.
  *
- * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ * 4. The names "The Jakarta Project", "Commons", and "Apache Software
  *    Foundation" must not be used to endorse or promote products derived
  *    from this software without prior written permission. For written
  *    permission, please contact apache@apache.org.
  *
  * 5. Products derived from this software may not be called "Apache"
  *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
+ *    permission of the Apache Software Foundation.
  *
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -68,10 +68,8 @@ import java.util.TimeZone;
  *
  * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
- *
- * @since Lang 2.0
- *
- * @version $Revision: 1.1 $
+ * @since 2.1
+ * @version $Id: DateUtils.java,v 1.2 2003/02/04 22:19:33 scolebourne Exp $
  */
 public final class DateUtils {
 
@@ -124,8 +122,12 @@ public final class DateUtils {
         MINUTE_SECONDS.setFormat(1, SECONDS_FORMAT);
     }
 
-    /** public constructor */
-    /// TODO: Insert note that this should not be used
+    /**
+     * <p>DateUtils instances should NOT be constructed in standard programming.</p>
+     *
+     * <p>This constructor is public to permit tools that require a JavaBean instance
+     * to operate.</p>
+     */
     public DateUtils() {
     }
 
diff --git a/src/java/org/apache/commons/lang/time/FastDateFormat.java b/src/java/org/apache/commons/lang/time/FastDateFormat.java
index 58846b1b0..240438882 100644
--- a/src/java/org/apache/commons/lang/time/FastDateFormat.java
+++ b/src/java/org/apache/commons/lang/time/FastDateFormat.java
@@ -51,7 +51,6 @@
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
-
 package org.apache.commons.lang.time;
 
 import java.util.Date;
@@ -67,7 +66,7 @@ import java.text.DateFormatSymbols;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 
-/******************************************************************************
+/**
  * Similar to {@link java.text.SimpleDateFormat}, but faster and thread-safe.
  * Only formatting is supported, but all patterns are compatible with
  * SimpleDateFormat. [Code originally taken from the open source TreeTrove
@@ -76,8 +75,8 @@ import java.text.SimpleDateFormat;
  * @author Brian S O'Neill
  * @author Sean Schofield
  * @author Gary Gregory
- * @since 2.0
- * @version $Id: FastDateFormat.java,v 1.3 2003/02/04 22:12:08 scolebourne Exp $
+ * @since 2.1
+ * @version $Id: FastDateFormat.java,v 1.4 2003/02/04 22:19:33 scolebourne Exp $
  */
 public class FastDateFormat {
     /** Style pattern */
diff --git a/src/java/org/apache/commons/lang/time/StopWatch.java b/src/java/org/apache/commons/lang/time/StopWatch.java
index f27dcdb0c..fec440b12 100644
--- a/src/java/org/apache/commons/lang/time/StopWatch.java
+++ b/src/java/org/apache/commons/lang/time/StopWatch.java
@@ -1,7 +1,7 @@
 /* ====================================================================
  * The Apache Software License, Version 1.1
  *
- * Copyright (c) 1999-2002 The Apache Software Foundation.  All rights
+ * Copyright (c) 1999-2003 The Apache Software Foundation.  All rights
  * reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -76,8 +76,8 @@ package org.apache.commons.lang.time;
  *
  * @author Henri Yandell
  * @author Stephen Colebourne
- * @since 2.0
- * @version $Id: StopWatch.java,v 1.1 2002/12/22 22:59:58 scolebourne Exp $
+ * @since 2.1
+ * @version $Id: StopWatch.java,v 1.2 2003/02/04 22:19:33 scolebourne Exp $
  */
 public class StopWatch {