diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly
index 4f996ce8..269e7c82 100644
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -31,19 +31,17 @@
     <attainGoal name="multiproject:create-nav"/>
     
     <!-- generate site docs -->
-    <j:set var="goal" value="clean,site" />
-    <attainGoal name="multiproject:goal" />
-    
-    <attainGoal name="site" />
-    
-    <!-- get all projects for processing -->
     <maven:reactor
       basedir="${maven.multiproject.basedir}"
       includes="${maven.multiproject.includes}"
       excludes="${maven.multiproject.excludes}"
       postProcessing="true"
-      ignoreFailures="true"
+      goals="clean,site"
+      ignoreFailures="${maven.multiproject.ignoreFailures}"
     />
+    
+    <attainGoal name="site" />
+    
     <!-- copy or not? -->
     <j:set var="navType" value="${maven.multiproject.navigation}"/>
     <j:if test="${navType == 'aggregate'}">
@@ -72,7 +70,10 @@
   <!--==================================================================-->    
   <goal name="multiproject:create-nav">
     <mkdir dir="${maven.gen.docs}"/>
-    <!-- get all projects for template processing -->
+
+    <!-- FIXME: 2) Needs to be a tag
+     | get all projects for template processing
+     | -->
     <maven:reactor
       basedir="${maven.multiproject.basedir}"
       includes="${maven.multiproject.includes}"
@@ -128,15 +129,9 @@ maven -Dgoal=clean multiproject:goal</m:param-check>
   <goal name="multiproject:artifact"
     description=" Builds all artifacts for all subproject">
 
-    <!-- fixme: use multiproject:goal here -->
-    <maven:reactor
-      basedir="${maven.multiproject.basedir}"
-      includes="${maven.multiproject.includes}"
-      excludes="${maven.multiproject.excludes}"
-      postProcessing="false"
-      goals="multiproject:artifact-callback"
-      ignoreFailures="${maven.multiproject.ignoreFailures}"
-    />
+    <j:set var="goal" name="multiproject:artifact-callback"/>
+    <attainGoal name="multiproject:goal"/>
+
   </goal>
   
   <goal name="multiproject:artifact-callback">