diff --git a/src/java/org/apache/commons/collections/BagUtils.java b/src/java/org/apache/commons/collections/BagUtils.java
index 170b3af11..8071b998e 100644
--- a/src/java/org/apache/commons/collections/BagUtils.java
+++ b/src/java/org/apache/commons/collections/BagUtils.java
@@ -11,7 +11,8 @@ import java.util.Set;
  *  and {@link SortedBag} instances.<P>
  *
  *  @author Paul Jack
- *  @version $Id: BagUtils.java,v 1.1 2002/08/13 00:26:51 pjack Exp $
+ *  @version $Id: BagUtils.java,v 1.2 2002/08/13 00:46:25 pjack Exp $
+ *  @since 2.1
  */
 public class BagUtils {
 
diff --git a/src/java/org/apache/commons/collections/BoundedFifoBuffer.java b/src/java/org/apache/commons/collections/BoundedFifoBuffer.java
index 985b45fdf..c59fabfce 100644
--- a/src/java/org/apache/commons/collections/BoundedFifoBuffer.java
+++ b/src/java/org/apache/commons/collections/BoundedFifoBuffer.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BoundedFifoBuffer.java,v 1.3 2002/07/03 02:16:48 mas Exp $
- * $Revision: 1.3 $
- * $Date: 2002/07/03 02:16:48 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BoundedFifoBuffer.java,v 1.4 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/08/13 00:46:25 $
  *
  * ====================================================================
  *
@@ -89,7 +89,8 @@ import java.util.NoSuchElementException;
  *
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  * @author Paul Jack
- * @version $Id: BoundedFifoBuffer.java,v 1.3 2002/07/03 02:16:48 mas Exp $
+ * @version $Id: BoundedFifoBuffer.java,v 1.4 2002/08/13 00:46:25 pjack Exp $
+ * @since Avalon 4.0
  */
 public class BoundedFifoBuffer extends AbstractCollection implements Buffer
 {
diff --git a/src/java/org/apache/commons/collections/BufferOverflowException.java b/src/java/org/apache/commons/collections/BufferOverflowException.java
index d74e33b2e..d117c10c3 100644
--- a/src/java/org/apache/commons/collections/BufferOverflowException.java
+++ b/src/java/org/apache/commons/collections/BufferOverflowException.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferOverflowException.java,v 1.2 2002/07/03 01:45:47 mas Exp $
- * $Revision: 1.2 $
- * $Date: 2002/07/03 01:45:47 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferOverflowException.java,v 1.3 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/08/13 00:46:25 $
  *
  * ====================================================================
  *
@@ -66,6 +66,8 @@ package org.apache.commons.collections;
  *
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  * @author <a href="mailto:jefft@apache.org">Jeff Turner</a>
+ * @version $Id: BufferOverflowException.java,v 1.3 2002/08/13 00:46:25 pjack Exp $
+ * @since Avalon 4.0
  */
 public class BufferOverflowException extends RuntimeException
 {
diff --git a/src/java/org/apache/commons/collections/BufferUnderflowException.java b/src/java/org/apache/commons/collections/BufferUnderflowException.java
index 31ae14af6..6cd7f9bfb 100644
--- a/src/java/org/apache/commons/collections/BufferUnderflowException.java
+++ b/src/java/org/apache/commons/collections/BufferUnderflowException.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferUnderflowException.java,v 1.2 2002/07/03 01:45:47 mas Exp $
- * $Revision: 1.2 $
- * $Date: 2002/07/03 01:45:47 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferUnderflowException.java,v 1.3 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/08/13 00:46:25 $
  *
  * ====================================================================
  *
@@ -65,6 +65,8 @@ package org.apache.commons.collections;
  *
  * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  * @author <a href="mailto:jefft@apache.org">Jeff Turner</a>
+ * @since Avalon 4.0
+ * @version $Id: BufferUnderflowException.java,v 1.3 2002/08/13 00:46:25 pjack Exp $
  */
 public class BufferUnderflowException extends RuntimeException
 {
diff --git a/src/java/org/apache/commons/collections/BufferUtils.java b/src/java/org/apache/commons/collections/BufferUtils.java
index 36d8a5855..adeec365b 100644
--- a/src/java/org/apache/commons/collections/BufferUtils.java
+++ b/src/java/org/apache/commons/collections/BufferUtils.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferUtils.java,v 1.4 2002/08/13 00:26:51 pjack Exp $
- * $Revision: 1.4 $
- * $Date: 2002/08/13 00:26:51 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/BufferUtils.java,v 1.5 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.5 $
+ * $Date: 2002/08/13 00:46:25 $
  *
  * ====================================================================
  *
@@ -69,7 +69,8 @@ import java.util.Iterator;
  *  Contains static utility methods for operating on {@link Buffer} objects.
  *
  *  @author Paul Jack
- *  @version $Id: BufferUtils.java,v 1.4 2002/08/13 00:26:51 pjack Exp $
+ *  @version $Id: BufferUtils.java,v 1.5 2002/08/13 00:46:25 pjack Exp $
+ *  @since 2.1
  */
 public class BufferUtils {
 
diff --git a/src/java/org/apache/commons/collections/CollatingIterator.java b/src/java/org/apache/commons/collections/CollatingIterator.java
index d3a8182a1..e82eec8e3 100644
--- a/src/java/org/apache/commons/collections/CollatingIterator.java
+++ b/src/java/org/apache/commons/collections/CollatingIterator.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/CollatingIterator.java,v 1.2 2002/07/10 14:06:39 rwaldhoff Exp $
- * $Revision: 1.2 $
- * $Date: 2002/07/10 14:06:39 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/CollatingIterator.java,v 1.3 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/08/13 00:46:25 $
  *
  * ====================================================================
  *
@@ -73,8 +73,9 @@ import java.util.BitSet;
  * my {@link #next} method will return the lesser of 
  * <code>A.next()</code> and <code>B.next()</code>.
  *
- * @version $Revision: 1.2 $ $Date: 2002/07/10 14:06:39 $
+ * @version $Revision: 1.3 $ $Date: 2002/08/13 00:46:25 $
  * @author Rodney Waldhoff
+ * @since 2.1
  */
 public class CollatingIterator implements Iterator {
 
diff --git a/src/java/org/apache/commons/collections/ComparatorUtils.java b/src/java/org/apache/commons/collections/ComparatorUtils.java
index 2d6bc1c36..356da0215 100644
--- a/src/java/org/apache/commons/collections/ComparatorUtils.java
+++ b/src/java/org/apache/commons/collections/ComparatorUtils.java
@@ -77,10 +77,15 @@ import org.apache.commons.collections.comparators.TransformingComparator;
  *
  *  @author Paul Jack
  *  @version $Id$
+ *  @since 2.1
  */
 public class ComparatorUtils {
 
 
+    private ComparatorUtils() {
+    }
+
+
     /**
      *  Comparator for natural sort order.
      *
diff --git a/src/java/org/apache/commons/collections/FactoryUtils.java b/src/java/org/apache/commons/collections/FactoryUtils.java
index 44c87ab1a..327c28f76 100644
--- a/src/java/org/apache/commons/collections/FactoryUtils.java
+++ b/src/java/org/apache/commons/collections/FactoryUtils.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FactoryUtils.java,v 1.1 2002/05/29 02:57:41 arron Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/29 02:57:41 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/FactoryUtils.java,v 1.2 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/08/13 00:46:25 $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -69,7 +69,8 @@ import java.lang.reflect.*;
  * objects.
  *
  * @author Arron Bates
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
+ * @since 2.1
  */
 public class FactoryUtils {
   
@@ -174,4 +175,4 @@ public class FactoryUtils {
     private Class[] argTypes;
     private Object[] argObjects;
   }
-}
\ No newline at end of file
+}
diff --git a/src/java/org/apache/commons/collections/IteratorChain.java b/src/java/org/apache/commons/collections/IteratorChain.java
index 8e6b256f2..f52463e38 100644
--- a/src/java/org/apache/commons/collections/IteratorChain.java
+++ b/src/java/org/apache/commons/collections/IteratorChain.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/IteratorChain.java,v 1.3 2002/04/09 16:33:40 morgand Exp $
- * $Revision: 1.3 $
- * $Date: 2002/04/09 16:33:40 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/IteratorChain.java,v 1.4 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/08/13 00:46:25 $
  *
  * ====================================================================
  *
@@ -85,6 +85,8 @@ import java.util.NoSuchElementException;
  * to not alter the underlying List of Iterators.</p>
  * 
  * @author Morgan Delagrange
+ * @version $Id: IteratorChain.java,v 1.4 2002/08/13 00:46:25 pjack Exp $
+ * @since 2.1
  */
 public class IteratorChain implements Iterator {
 
diff --git a/src/java/org/apache/commons/collections/ListIteratorWrapper.java b/src/java/org/apache/commons/collections/ListIteratorWrapper.java
index bf4fa5c51..04589d75d 100644
--- a/src/java/org/apache/commons/collections/ListIteratorWrapper.java
+++ b/src/java/org/apache/commons/collections/ListIteratorWrapper.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/ListIteratorWrapper.java,v 1.1 2002/04/09 16:40:43 morgand Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/09 16:40:43 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/ListIteratorWrapper.java,v 1.2 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/08/13 00:46:25 $
  *
  * ====================================================================
  *
@@ -71,7 +71,8 @@ import java.util.NoSuchElementException;
  * operations of ListIterator.
  * 
  * @author Morgan Delagrange
- * @version $Revision: 1.1 $ $Date: 2002/04/09 16:40:43 $
+ * @version $Revision: 1.2 $ $Date: 2002/08/13 00:46:25 $
+ * @since 2.1
  */
 public class ListIteratorWrapper implements ListIterator {
 
diff --git a/src/java/org/apache/commons/collections/PredicateUtils.java b/src/java/org/apache/commons/collections/PredicateUtils.java
index dd65b6ac5..1f9adb866 100644
--- a/src/java/org/apache/commons/collections/PredicateUtils.java
+++ b/src/java/org/apache/commons/collections/PredicateUtils.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/PredicateUtils.java,v 1.3 2002/08/13 00:26:51 pjack Exp $
- * $Revision: 1.3 $
- * $Date: 2002/08/13 00:26:51 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/PredicateUtils.java,v 1.4 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/08/13 00:46:25 $
  *
  * ====================================================================
  *
@@ -86,6 +86,8 @@ import java.util.SortedMap;
  * And, Or and instanceof.
  * 
  * @author Stephen Colebourne
+ * @version $Id: PredicateUtils.java,v 1.4 2002/08/13 00:46:25 pjack Exp $
+ * @since 2.1
  */
 public class PredicateUtils {
     
diff --git a/src/java/org/apache/commons/collections/ReferenceMap.java b/src/java/org/apache/commons/collections/ReferenceMap.java
index 01424e1de..db2a6144e 100644
--- a/src/java/org/apache/commons/collections/ReferenceMap.java
+++ b/src/java/org/apache/commons/collections/ReferenceMap.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/ReferenceMap.java,v 1.3 2002/08/12 19:59:49 pjack Exp $
- * $Revision: 1.3 $
- * $Date: 2002/08/12 19:59:49 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/ReferenceMap.java,v 1.4 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/08/13 00:46:25 $
  *
  * ====================================================================
  *
@@ -120,6 +120,8 @@ import java.util.Set;
  *  provide synchronized access to a <Code>ReferenceMap</Code>.
  *
  *  @author Paul Jack 
+ *  @version $Id: ReferenceMap.java,v 1.4 2002/08/13 00:46:25 pjack Exp $
+ *  @since 2.1
  *  @see java.lang.ref.Reference
  */
 public class ReferenceMap extends AbstractMap implements Serializable {
diff --git a/src/java/org/apache/commons/collections/SetUtils.java b/src/java/org/apache/commons/collections/SetUtils.java
index d214a9afc..2298b6436 100644
--- a/src/java/org/apache/commons/collections/SetUtils.java
+++ b/src/java/org/apache/commons/collections/SetUtils.java
@@ -13,7 +13,8 @@ import java.util.SortedSet;
  *  and {@link SortedSet} instances.
  *
  *  @author Paul Jack
- *  @version $Id: SetUtils.java,v 1.1 2002/08/13 00:26:51 pjack Exp $
+ *  @version $Id: SetUtils.java,v 1.2 2002/08/13 00:46:25 pjack Exp $
+ *  @since 2.1
  */
 public class SetUtils {
 
diff --git a/src/java/org/apache/commons/collections/SimpleObjectFactory.java b/src/java/org/apache/commons/collections/SimpleObjectFactory.java
index 7b00ae334..709b993ca 100644
--- a/src/java/org/apache/commons/collections/SimpleObjectFactory.java
+++ b/src/java/org/apache/commons/collections/SimpleObjectFactory.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/SimpleObjectFactory.java,v 1.1 2002/05/29 02:57:41 arron Exp $
- * $Revision: 1.1 $
- * $Date: 2002/05/29 02:57:41 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/SimpleObjectFactory.java,v 1.2 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/08/13 00:46:25 $
  * ====================================================================
  *
  * The Apache Software License, Version 1.1
@@ -68,7 +68,8 @@ import java.lang.reflect.*;
  * to create an object.
  *
  * @author Arron Bates
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
+ * @since 2.1
  */
 public interface SimpleObjectFactory {
 
@@ -78,4 +79,4 @@ public interface SimpleObjectFactory {
    */
   public Object createObject();
   
-}
\ No newline at end of file
+}
diff --git a/src/java/org/apache/commons/collections/UniqueFilterIterator.java b/src/java/org/apache/commons/collections/UniqueFilterIterator.java
index 3ca7898bf..fd145a2b3 100644
--- a/src/java/org/apache/commons/collections/UniqueFilterIterator.java
+++ b/src/java/org/apache/commons/collections/UniqueFilterIterator.java
@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/UniqueFilterIterator.java,v 1.1 2002/04/09 16:43:19 morgand Exp $
- * $Revision: 1.1 $
- * $Date: 2002/04/09 16:43:19 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//collections/src/java/org/apache/commons/collections/Attic/UniqueFilterIterator.java,v 1.2 2002/08/13 00:46:25 pjack Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/08/13 00:46:25 $
  *
  * ====================================================================
  *
@@ -69,6 +69,8 @@ import java.util.NoSuchElementException;
   * and duplicate Objects are skipped.
   *
   * @author Morgan Delagrange
+  * @version $Id: UniqueFilterIterator.java,v 1.2 2002/08/13 00:46:25 pjack Exp $
+  * @since 2.1
   */
 
 public class UniqueFilterIterator extends FilterIterator {