diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 45c7d743..1084e99d 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -53,11 +53,13 @@
       
       <j:if test="${add.equals('true')}">
         <j:new var="report" className="java.util.HashMap"/>
-        <j:set var="dummy" value="${report.put('name', name)}"/>
-        <j:set var="dummy" value="${report.put('pluginName', pluginName)}"/>
-        <j:set var="dummy" value="${report.put('description', description)}"/>
-        <j:set var="dummy" value="${report.put('link', link)}"/>
-        <j:set var="dummy" value="${reports.add(report)}"/>    
+        <j:set var="dummy">
+          ${report.put('name', name)}
+          ${report.put('pluginName', pluginName)}
+          ${report.put('description', description)}
+          ${report.put('link', link)}
+          ${reports.add(report)}
+        </j:set>
       </j:if>
 
     </define:tag>
@@ -117,10 +119,10 @@
        | documents easily. See jslCore for a tag suitable for
        | transforming documents how you want.
        | @input
-       | @output - Will be placed under ${maven.gen.docs}
+       | @outputDirectory - Will be placed under ${maven.gen.docs}
        | @stylesheet
-       | @encoding
-       | @omitXmlDeclaration
+       | @encoding           - defaults to ${maven.docs.outputencoding}
+       | @omitXmlDeclaration - defaults to ${maven.docs.omitXmlDeclaration}
        | @outputMode
        | @prettyPrint
       -->
@@ -130,15 +132,7 @@
       -->        
       
       <!-- Set default outputDirectory if not set. -->
-      <!--
-      These do not work to evaluate to what you would expect
-      <j:if test="!${outputDirectory}">
-      
-      why doesn't this give the same as comparing to null?
-      why not use empty()?
-      
-      -->
-      <j:if test="${outputDirectory == null}">
+      <j:if test="${empty(outputDirectory)}">
         <j:set var="outputDirectory"  value="${maven.gen.docs}"
         />
       </j:if>