--- a/rgToolFactory.xml	Tue Oct 07 18:50:49 2014 -0400
+++ b/rgToolFactory.xml	Tue Oct 07 20:23:23 2014 -0400
@@ -1,4 +1,4 @@
-<tool id="rgTF" name="Tool Factory" version="1.11">
+<tool id="rgTF" name="Tool Factory" version="1.12">
   <description>Makes scripts into tools</description>
    <requirements>
       <requirement type="package" version="9.10">ghostscript</requirement>
@@ -10,25 +10,22 @@
 #else:
     rgToolFactory.py --script_path "$runme" --interpreter "$interpreter" 
      --tool_name "$tool_name"  --user_email "$__user_email__"
-    #if $make_TAB.value=="yes":
+    #if $make_TAB=="yes":
        --output_tab "$tab_file"
        --output_format "$output_format"
     #end if
-    #if $makeMode.make_Tool=="yes":
-      --make_Tool "$makeMode.make_Tool"
+    #if $makeMode.make_Tool == "yes":
+      --make_Tool "yes"
       --tool_desc "$makeMode.tool_desc"
       --tool_version "$makeMode.tool_version"
       --new_tool "$new_tool"
       --help_text "$helpme"
-      #if $make_HTML.value=="yes":
-          #if makeMode.include_deps.value=="yes":
-             --include_dependencies "yes"
-          #end if
-      #end if
       --citations "$citeme"
+      --include_dependencies "yes"
     #end if
-    #if $make_HTML.value=="yes":
-      --output_dir "$html_file.files_path" --output_html "$html_file" --make_HTML "yes"
+
+    #if $make_HTML=="yes":
+        --output_dir "$html_file.files_path" --output_html "$html_file" --make_HTML "yes"
     #else:
        --output_dir "."
     #end if
@@ -67,8 +64,7 @@
              size="8x120" value="**What it Does**" 
              help="Supply the brief user documentation to appear on the new tool form as reStructured text - http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html" >           
                 <sanitizer>
-                    <valid initial="string.printable">
-                    </valid>
+                    <valid initial="string.printable"/>
                     <mapping initial="none"/>
                 </sanitizer>
             </param>
@@ -91,8 +87,7 @@
                         <param name="bibtex" label="BibTex" type="text" area="true" size="8x120"
                             help="Supply a BibTex entry that should be cited when this tool is used in published research." value="" >
                             <sanitizer>
-                                <valid initial="string.printable">
-                                </valid>
+                                <valid initial="string.printable"/>
                                 <mapping initial="none"/>
                             </sanitizer>
                         </param>
@@ -155,20 +150,20 @@
 <configfile name="runme">$dynScript</configfile>
 <configfile name="helpme">
 #if $makeMode.make_Tool == "yes":
-${makeMode.help_text}
+$makeMode.help_text
 #end if
 </configfile>
 <configfile name="citeme">
 #if $makeMode.make_Tool == "yes":
-#for $citation in $makeMode.citations:
-#if $citation.citation_type.type == "bibtex":
-**ENTRY**bibtex
-${citation.citation_type.bibtex}
-#else
-**ENTRY**doi
-${citation.citation_type.doi}
-#end if
-#end for
+  #for $citation in $makeMode.citations:
+    #if $citation.citation_type.type == "bibtex":
+       **ENTRY**bibtex
+       ${citation.citation_type.bibtex}
+    #else:
+       **ENTRY**doi
+       ${citation.citation_type.doi}
+    #end if
+  #end for
 #end if
 </configfile>
 </configfiles>