--- a/hmmbuild.xml	Wed Apr 04 14:01:35 2018 -0400
+++ b/hmmbuild.xml	Sat Apr 07 03:51:18 2018 -0400
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<tool id="hmmer_hmmbuild" name="hmmbuild" version="@WRAPPER_VERSION@.0">
+<tool id="hmmer_hmmbuild" name="hmmbuild" version="@TOOL_VERSION@">
   <description>Build a profile HMM from an input multiple alignment</description>
   <macros>
     <import>macros.xml</import>
@@ -10,7 +10,7 @@
 hmmbuild
 
 #if $hmmname:
--n "$hmmname"
+    -n '$hmmname'
 #end if
 
 @FORMAT_SELECTOR@
@@ -25,16 +25,16 @@
 @SEED@
 
 @LENGTHS@
-#if $maxinsertlen:
---maxinsertlen $maxinsertlen
+#if str($maxinsertlen):
+    --maxinsertlen $maxinsertlen
 #end if
 
-$hmmout
-$msafile
-      ]]></command>
+'$hmmout'
+'$msafile'
+  ]]></command>
   <inputs>
     <expand macro="input_msa" />
-    <param name="hmmname" type="text" optional="True" label="Name for the HMM" help="(-n)"/>
+    <param name="hmmname" argument="-n" type="text" optional="true" label="Name for the HMM" />
     <expand macro="format_selector"/>
     <expand macro="mcss"/>
     <expand macro="arsws"/>
@@ -45,11 +45,10 @@
     <expand macro="seed"/>
 
     <expand macro="lengths" />
-    <param name="maxinsertlen" label="Pretend all inserts are length &lt;= n"
-        help="(--maxinsertlen)" optional="True" type="integer"/>
+    <param argument="--maxinsertlen" type="integer" optional="true" label="Pretend all inserts are length &lt;= n" />
   </inputs>
   <outputs>
-    <data format="hmm3" name="hmmout" label="HMM profile from $msafile.name"/>
+    <data name="hmmout" format="hmm3" label="HMM profile from $msafile.name"/>
   </outputs>
   <tests>
     <test>
@@ -83,6 +82,6 @@
 @LENGTHS_HELP@
 
 @ATTRIBUTION@
-]]></help>
+  ]]></help>
   <expand macro="citation"/>
 </tool>