diff --git a/contrib/retep/build.xml b/contrib/retep/build.xml
index a5a168ea30a..9fbc0f61ac5 100644
--- a/contrib/retep/build.xml
+++ b/contrib/retep/build.xml
@@ -2,7 +2,7 @@
 
   build file to build the donated retep tools packages
 
-  $Id: build.xml,v 1.6 2001/05/16 17:09:25 momjian Exp $
+  $Id: build.xml,v 1.7 2001/05/17 03:22:53 momjian Exp $
 
 -->
 
@@ -35,8 +35,10 @@
 
   <!-- This target removes any class files from the build directory -->
   <target name="clean">
-    <delete dir="${dest}" />
-    <delete dir="${jars}" />
+    <delete>
+    <fileset dir="${dest}" />
+    <fileset dir="${jars}" />
+    </delete>
   </target>
 
   <!-- Builds the XML Tools -->
diff --git a/doc/TODO b/doc/TODO
index 87482045ea6..63b7d3bbe9d 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -64,8 +64,6 @@ TYPES
 * Add IPv6 capability to INET/CIDR types
 * Add conversion function from text to inet
 * Store binary-compatible type information in the system
-* Allow nulls in arrays
-* Allow arrays to be ORDER'ed
 * Support construction of array result values in expressions
 * Remove Money type, add money formatting for decimal type
 * Declare typein/out functions in pg_proc with a special "C string" data type
@@ -78,10 +76,14 @@ TYPES
 * SELECT cash_out(2) crashes because of opaque
 * Add SQL standard function bit_length()
 * Make oid use unsigned int more reliably, pg_atoi()
+* ARRAYS
+	* Allow nulls in arrays
+	* Allow arrays to be ORDER'ed
+	* fix array handling in ECPG
 
 MULTILANGUAGE SUPPORT
 
-* Add nchar (as distinguished from ordinary varchar),
+* Add NCHAR (as distinguished from ordinary varchar),
 * Allow LOCALE on a per-column basis, default to ASCII
 * Support multiple simultaneous character sets, per SQL92
 * Reject character sequences those are not valid in their charset
@@ -112,12 +114,12 @@ INDEXES
 * Use indexes for min() and max()
 * Use index to restrict rows returned by multi-key index when used with
   non-consecutive keys or OR clauses, so fewer heap accesses
-* Allow SELECT * FROM tab WHERE int2col = 4 use int2col index, int8,
+* Allow SELECT * FROM tab WHERE int2col = 4 to use int2col index, int8,
   float4, numeric/decimal too [optimizer]
 * Use indexes with CIDR '<<' (contains) operator
 * Allow LIKE indexing optimization for non-ASCII locales
 * Be smarter about insertion of already-ordered data into btree index
-* Gather more accurate dispersion statistics using indexes
+* -Gather more accurate dispersion statistics using indexes
 * Add deleted bit to index tuples to reduce heap access
 * Prevent index uniqueness checks when UPDATE does not modifying column
 
@@ -132,6 +134,14 @@ SYSTEM TABLES
 
 COMMANDS
 
+* Add SIMILAR TO to allow character classes, 'pg_[a-c]%'
+* Auto-destroy sequence on DROP of table with SERIAL, perhaps with a separate
+  SERIAL type
+* Allow LOCK TABLE tab1, tab2, tab3 so all tables locked in unison [lock]
+* Allow RULE recompilation
+* Add BETWEEN ASYMMETRIC/SYMMETRIC
+* Change LIMIT val,val to offset,limit to match MySQL
+* Allow Pl/PgSQL's RAISE function to take expressions
 * ALTER
 	* ALTER TABLE ADD COLUMN to inherited table put column in wrong place
 	  [inheritance]
@@ -159,12 +169,6 @@ COMMANDS
 	* Allow INSERT INTO my_table VALUES (a, b, c, DEFAULT, x, y, z, ...)
 	* Disallow missing columns in INSERT ... VALUES, per ANSI
 	* Allow INSERT/UPDATE ... RETURNING new.col or old.col (Philip)
-* Add SIMILAR TO to allow character classes, 'pg_[a-c]%'
-* Auto-destroy sequence on DROP of table with SERIAL, perhaps with a separate
-  SERIAL type
-* Allow LOCK TABLE tab1, tab2, tab3 so all tables locked in unison [lock]
-* Allow RULE recompilation
-* Add BETWEEN ASYMMETRIC/SYMMETRIC
 * SHOW/SET
 	* Add SHOW command to display locks
 	* Add a global RESET command for use with connection pooling
@@ -174,14 +178,11 @@ COMMANDS
 	* Add SET PERFORMANCE_TIPS option to suggest INDEX, VACUUM, VACUUM
 	  ANALYZE, and CLUSTER
 	* Add SHOW command to see locale
-* Change LIMIT val,val to offset,limit to match MySQL
-* Allow Pl/PgSQL's RAISE function to take expressions
 
 CLIENTS
 
 * Make NULL's come out at the beginning or end depending on the
   ORDER BY direction
-* fix array handling in ECPG
 * have pg_dump use LEFT OUTER JOIN in multi-table SELECTs
   or multiple SELECTS to avoid bad system catalog entries
 * allow psql \d to show primary and foreign keys
diff --git a/src/interfaces/jdbc/Makefile b/src/interfaces/jdbc/Makefile
index e8fd28d51b1..b6311dd3a42 100644
--- a/src/interfaces/jdbc/Makefile
+++ b/src/interfaces/jdbc/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.29 2001/05/17 00:29:52 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.30 2001/05/17 03:22:53 momjian Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -37,4 +37,3 @@ uninstall:
 
 clean distclean maintainer-clean:
 	$(ANT) -buildfile $(top_srcdir)/build.xml clean
-	rm -f org/postgresql/Driver.java
diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml
index 5c31201bf8f..034abb0841b 100644
--- a/src/interfaces/jdbc/build.xml
+++ b/src/interfaces/jdbc/build.xml
@@ -3,7 +3,7 @@
   build file to allow ant (http://jakarta.apache.org/ant/) to be used
   to build the PostgreSQL JDBC Driver.
 
-  $Id: build.xml,v 1.10 2001/05/16 17:09:26 momjian Exp $
+  $Id: build.xml,v 1.11 2001/05/17 03:22:53 momjian Exp $
 
 -->
 
@@ -83,8 +83,10 @@
 
   <!-- This target removes any class files from the build directory -->
   <target name="clean">
-    <delete dir="${dest}" />
-    <delete dir="${jars}" />
+    <delete>
+	<fileset dir="${dest}" />
+    	<fileset dir="${jars}" />
+    </delete>
     <delete file="${package}/Driver.java" />
   </target>