diff --git a/build.xml b/build.xml
index a87d2f855..24939f5cf 100644
--- a/build.xml
+++ b/build.xml
@@ -118,13 +118,13 @@ printed.
         
      all -------------- creates the jars and the site      
      compile ---------- compiles the source code      
+     test ------------- performs the jUnit tests       
      jar -------------- create the jar files
      docs ------------- generates the html docs - clean not needed        
+     javadocs --------- generates the API documentation   
      site ------------- generates the html site (docs+reports)    
-     javadocs --------- generates the API documentation     
-     test ------------- performs the jUnit tests       
      clean ------------ cleans the build directory    
-     quickdist -------- creates src and bin distributions    
+     dist ------------- creates src and bin distributions    
      scratchpad ------- build-run scratchpad code       
      contrib ---------- build-run contributed code    
      generate-records - generate excel records    
@@ -253,13 +253,13 @@ printed.
     
   </target>     
 
-  <!-- ================================== -->
-  <!--         Build distributions        -->
-  <!-- ================================== -->
+  <!-- ====================================== -->
+  <!--  dist target wo single build checks    -->
+  <!-- ====================================== -->
+
+  <target  name="dist"   depends="-init, clean, test, jar, site"
+           description="Build distribution packages wo single build checks">
 
-  <target  name="dist" depends="-init"
-           description="Make distributions">
-           
     <echo>**********************************************</echo>
     <echo>*</echo>
     <echo>*  Build all distributions:</echo> 
@@ -273,25 +273,8 @@ printed.
     <echo>*</echo>        
     <echo>***********************************************</echo>
     <echo/>
-
-    <antcall target="gump"/>
     
-    <antcall target="quickdist"/>
-    
-  </target>     
 
-  <!-- ====================================== -->
-  <!--  dist target wo single build checks    -->
-  <!-- ====================================== -->
-
-  <target  name="quickdist"   depends="-init"
-           description="Build distribution packages wo single build checks">
-
-    <antcall target="call-cent">
-      <param name="cent-name"   value="junit"/> 
-      <param name="cent-target" value="test"/> 
-    </antcall>
-    
     <antcall target="call-cent">
       <param name="cent-name"   value="centipede"/> 
       <param name="cent-target" value="dist"/> 
@@ -299,6 +282,7 @@ printed.
     
   </target>    
   
+    
   <!-- ================================== -->
   <!--         Clean build dir            -->
   <!-- ================================== -->
@@ -317,14 +301,10 @@ printed.
   <!--         Run Junit tests            -->
   <!-- ================================== -->
   
-  <target  name="test"   depends="-init"
+  <target  name="test"   depends="-init, compile"
            description="Compile java source code">
 
-    <antcall target="call-cent">
-      <param name="cent-name"   value="centipede"/> 
-      <param name="cent-target" value="compile"/> 
-    </antcall>
-
+ 
     <antcall target="call-cent">
       <param name="cent-name"   value="junit"/> 
       <param name="cent-target" value="test"/> 
@@ -341,14 +321,9 @@ printed.
   <!--      Generate project metrics      -->
   <!-- ================================== -->
   
-  <target  name="metrics"   depends="-init"
+  <target  name="metrics"   depends="-init, compile"
            description="Generate project metrics">
 
-    <antcall target="call-cent">
-      <param name="cent-name"   value="centipede"/> 
-      <param name="cent-target" value="compile"/> 
-    </antcall>
-    
     <antcall target="call-cent">
       <param name="cent-name"   value="jdepend"/>
       <param name="cent-target" value="jdepend-html"/> 
@@ -376,15 +351,12 @@ printed.
   <!-- ================================== -->
   
   <target  name="site"
-           description="Makes all the site doco">
+           description="Makes all the site doco"
+           depends="docs, 
+                    test,
+                    javadocs,  
+                    metrics"/>
 
-      <antcall target="docs"/>
-      <antcall target="compile"/>
-      <antcall target="javadocs"/>
-      <antcall target="test"/>
-      <antcall target="metrics"/>
-             
-  </target>     
   
   <!-- ================================== -->
   <!--       Generates the javadocs       -->
@@ -497,6 +469,18 @@ printed.
       <antcall target="javadocs"/>
 
   </target>
+
+  <!-- ================================== -->
+  <!--         Test 4 distribution        -->
+  <!-- ================================== -->
+
+  <target  name="testall" depends="-init"
+           description="Make big full test">
+           
+    <antcall target="gump"/>
+    <antcall target="quickdist"/>
+    
+  </target>       
                       
   <!-- ================================== -->
   <!--        Target used by Gump         -->
@@ -506,11 +490,8 @@ printed.
            depends="testmodule"
            description="Target used by Gump">
            
-      <antcall target="clean"/>
       <antcall target="testtargets"/>
-      <antcall target="clean"/>
       <antcall target="testmodule"/>
-      <antcall target="clean"/>
       <antcall target="all"/>
       
   </target>
diff --git a/properties.xml b/properties.xml
index 91421dc13..96db912e8 100644
--- a/properties.xml
+++ b/properties.xml
@@ -1,55 +1,75 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="tools/antipede/resources/stylesheets/properties.xsl"?>
-<!-- Project properties -->     
+<!-- Build properties - these override any property specified in the build -->
 <properties>
-  <!-- Properties for core Ant tasks-->  
-  <ant>
-    <XmlLogger>
-      <stylesheet uri="./tools/antipede/resources/stylesheets/log.xsl"/> 
-    </XmlLogger>
-  </ant>    
-  
-  <XmlLogger file="log.xml"/>
-    
-  <!-- Properties of the build -->     
-  <build>
-  <!-- What to tell the compiler -->
-    <compiler emacs="on"
-              warnings="true"
-              pedantic="false"
-              depend="true"
-              fulldepend="true"
-              debug="on"
-              optimize="off"
-              deprecation="on"
-              nowarn="off"
-              type="classic"
-              vm="1.2"/>
-              
-  </build>           
-  <forrest>
-    <!-- available skins:
 
-         basic
-         jakarta-site
-         avalon-site
-         scarab-site
-         xml-apache-site
-         forrest-site  (Work In Progress)
- -->       
-    <skin name="avalon-site">
-     <navlinks>
-      <link1 href="http://www.apache.org/">apache.org</link1>
-      <link2 href="http://jakarta.apache.org/">jakarta.apache.org</link2>
-      <link3 href="http://jakarta.apache.org/poi/">jakarta.apache.org/poi</link3>
-     </navlinks>
-     <logo>
-      <group src="images/group-logo.gif" href="http://jakarta.apache.org"/>
-      <project src="images/project-logo.gif" href="http://jakarta.apache.org/poi/"/>
-     </logo>
-    
-    </skin>
-    
-  </forrest>    
-  
-</properties>
\ No newline at end of file
+<!-- Properties for core Ant tasks-->
+   <ant>
+      <XmlLogger>
+         <stylesheet
+          uri="./tools/antipede/resources/stylesheets/log.xsl" />
+      </XmlLogger>
+   </ant>
+
+   <XmlLogger
+    file="log.xml" />
+
+   <!-- Properties of the build -->
+   <build>
+      <!-- What to tell the compiler -->
+      <compiler
+       emacs="on"
+       warnings="true"
+       pedantic="false"
+       depend="true"
+       fulldepend="true"
+       debug="on"
+       optimize="off"
+       deprecation="on"
+       nowarn="off"
+       type="classic"
+       vm="1.2" />
+   </build>
+
+   <centipede>
+      <tools>
+         <cents>
+            <forrest-cent>
+              <!-- available skins:
+
+                   basic
+                   jakarta-site
+                   avalon-site
+                   scarab-site
+                   xml-apache-site
+                   forrest-site  (Work In Progress)
+               -->
+               <skin
+                name="avalon-site">
+                  <navlinks>
+                     <link1
+                      href="http://www.apache.org/">apache.org</link1>
+
+                     <link2
+                      href="http://jakarta.apache.org/">jakarta.apache.org</link2>
+
+                     <link3
+                      href="http://jakarta.apache.org/poi/">jakarta.apache.org/poi</link3>
+                  </navlinks>
+
+                  <logo>
+                     <group
+                      src="images/group-logo.gif"
+                      href="http://jakarta.apache.org" />
+
+                     <project
+                      src="images/project-logo.gif"
+                      href="http://jakarta.apache.org/poi/" />
+                  </logo>
+               </skin>
+            </forrest-cent>
+         </cents>
+      </tools>
+   </centipede>
+</properties>
+
diff --git a/tools/cents/centipede.cent.jar b/tools/cents/centipede.cent.jar
index de3b849b5..1388fdcdb 100644
Binary files a/tools/cents/centipede.cent.jar and b/tools/cents/centipede.cent.jar differ
diff --git a/tools/cents/checkstyle.cent.jar b/tools/cents/checkstyle.cent.jar
index eb8466d97..591549593 100644
Binary files a/tools/cents/checkstyle.cent.jar and b/tools/cents/checkstyle.cent.jar differ
diff --git a/tools/cents/forrest.cent.jar b/tools/cents/forrest.cent.jar
index ea19531e3..6d565d5d8 100644
Binary files a/tools/cents/forrest.cent.jar and b/tools/cents/forrest.cent.jar differ
diff --git a/tools/cents/jdepend.cent.jar b/tools/cents/jdepend.cent.jar
index 92f9177ab..5cfe1498d 100644
Binary files a/tools/cents/jdepend.cent.jar and b/tools/cents/jdepend.cent.jar differ
diff --git a/tools/cents/umldoclet.cent.jar b/tools/cents/umldoclet.cent.jar
index fdcd196ae..1edd7a377 100644
Binary files a/tools/cents/umldoclet.cent.jar and b/tools/cents/umldoclet.cent.jar differ