diff --git a/project.xml b/project.xml
index b4229a3..415bd63 100644
--- a/project.xml
+++ b/project.xml
@@ -1,27 +1,19 @@
-<?xml version="1.0"?>
-<project>
+<?xml version="1.0" encoding="UTF-8"?>
 
+<project>
   <name>jakarta-commons-graph2</name>
   <id>graph</id>
-  <currentVersion>0.3</currentVersion>
+  <currentVersion>0.8</currentVersion>
   <organization>Apache Software Foundation</organization>
   <inceptionYear>2001</inceptionYear>
   <package>org.apache.commons.graph</package>
-
   <shortDescription>Graph Representation and Manipulation Library</shortDescription>
-
-  <description>
-  <![CDATA[
-Jakarta Graph is a toolkit for managing graphs and graph based data structures.
-  ]]>
-  </description>
-
+  <description>Jakarta Graph is a toolkit for managing graphs and graph based data structures.</description>
   <url>http://jakarta.apache.org/commons/graph/</url>
   <cvsWebUrl>http://cvs.apache.org/viewcvs/jakarta-commons-sandbox/graph2</cvsWebUrl>
   <siteAddress>jakarta.apache.org</siteAddress>
   <siteDirectory>/www/jakarta.apache.org/commons/graph/</siteDirectory>
   <distributionDirectory>/www/jakarta.apache.org/builds/jakarta-commons-graph/</distributionDirectory>
-
   <mailingLists>
     <mailingList>
       <name>Turbine User List</name>
@@ -36,113 +28,67 @@ Jakarta Graph is a toolkit for managing graphs and graph based data structures.
       <archive>http://www.mail-archive.com/turbine-dev@jakarta.apache.org/</archive>
     </mailingList>
   </mailingLists>
-
   <developers>
-
-    <!-- Eventually this might be a reference to a developer
-         id, but the question is where the individual entries
-         should reside. For the Turbine projects maybe an overall
-         repository of developer entries, but for other projects
-         what do we do. A global repository of Java developer ids?
-
-         I am adding the login for each developer, so maybe this
-         is really a per-project things like password and login
-         may be different for each project but possibly the
-         identity of the developer could be store in some
-         repository. Anyway, suggests tweaks to the model.
-    -->
-
     <developer>
       <name>David Dixon-Peugh</name>
       <id>dpeugh</id>
       <email>dpeugh@mindspring.com</email>
       <organization>UltraLog At DARPA</organization>
     </developer>
-
     <developer>
       <name>Jason van Zyl</name>
       <id>jvanzyl</id>
       <email>jason@zenplex.com</email>
       <organization>Zenplex</organization>
     </developer>
-
   </developers>
-
-
-  <!-- Need to mark these as compile-time/run-time -->
-
   <dependencies>
-
     <dependency>
       <name>jakarta-log4j</name>
       <type>required</type>
       <version>1.1.3</version>
       <jar>log4j-1.1.3.jar</jar>
     </dependency>
-
     <dependency>
       <name>nsuml</name>
       <type>required</type>
       <version>0.4.20</version>
       <jar>nsuml.jar</jar>
     </dependency>
-
     <dependency>
       <name>commons-collections</name>
       <type>required</type>
       <version>1.0</version>
       <jar>commons-collections.jar</jar>
     </dependency>
-
     <dependency>
       <name>jdepend</name>
       <type>required</type>
       <version>1.0</version>
       <jar>jdepend.jar</jar>
     </dependency>
-
   </dependencies>
-
   <build>
-
     <sourceDirectories>
       <sourceDirectory>src/java</sourceDirectory>
     </sourceDirectories>
-
     <testSourceDirectories>
       <testSourceDirectory>src/java</testSourceDirectory>
       <testSourceDirectory>src/test</testSourceDirectory>
     </testSourceDirectories>
-
-    <aspectSourceDirectories>
-    </aspectSourceDirectories>
-
+    <aspectSourceDirectories/>
     <!-- Unit test classes -->
+
     <unitTestClassEntries>
       <unitTestClassEntry>include = **/*Test.class</unitTestClassEntry>
-<!--
-      <unitTestClassEntry>exclude = **/AllPathsTest.class</unitTestClassEntry>
--->
     </unitTestClassEntries>
-
     <!-- Runtime unit test classes -->
-    <runtimeTestClassEntries>
-    </runtimeTestClassEntries>
 
+    <runtimeTestClassEntries/>
     <!-- J A R  R E S O U R C E S -->
     <!-- Resources that are packaged up inside the JAR file -->
 
-    <jarResources>
-    </jarResources>
-
-    <jars>
-    </jars>
+    <jarResources/>
+    <jars/>
   </build>
 </project>
-
-
-
-
-
-
-