--- a/abricate.xml	Tue Nov 29 14:52:34 2016 -0500
+++ b/abricate.xml	Fri Mar 03 14:56:09 2017 -0500
@@ -1,28 +1,26 @@
-<tool id="abricate" name="ABRicate" version="0.1.0">
+<tool id="abricate" name="ABRicate" version="0.3">
     <requirements>
         <requirement type="package" version="0.3">abricate</requirement>
-        <requirement type="package" version="5.18.1">perl</requirement>
-        <requirement type="package" version="2.2.31">blast+</requirement>
     </requirements>
 
     <version_command>abricate --version</version_command>
 
     <command detect_errors="exit_code"><![CDATA[
-        abricate "$fasta_input"
+        abricate '$fasta_input'
         #if $settings.advanced == "advanced"
             $settings.no_header
-            #if $settings.min_dna_id
+            #if str($settings.min_dna_id)
                 --minid=$settings.min_dna_id
             #end if
-            #if $settings.cull_limit
+            #if str($settings.cull_limit)
                 --cull=$settings.cull_limit
             #end if
         #end if
-        > "$report"
+        > '$report'
     ]]></command>
 
     <inputs>
-        <param name="fasta_input" type="data" format="fasta" label="Select fasta file" help="Specify fasta file to screen for antibiotic resistant genes"/>
+        <param name="fasta_input" type="data" format="fasta" label="FASTA file" help="To screen for antibiotic resistant genes" />
         <conditional name="settings">
             <param name="advanced" type="select" label="Specify advanced parameters">
                 <option value="simple" selected="true">No, use program defaults.</option>
@@ -31,18 +29,15 @@
             <when value="simple">
             </when>
             <when value="advanced">
-                <param name="no_header" type="boolean" label="Suppress header" truevalue="--noheader" falsevalue=""
-                  help="Suppress output file's column headings" optional="true" />
-                <param name="min_dna_id" type="integer" label="Minimum DNA identity" value="75" min="0" max="100" help="Minimum DNA identity (default 75, must be between 0-100)" optional="true" />
-                <param name="cull_limit" type="integer" label="Culling limit" value="1" min="0" help="Culling limit (encompassing hits) (default 1, must be a positive number)" optional="true">
-                    <validator type="in_range" message="This value must be greater than or equal to 0" min="0" max="2147483647"/>
-                </param>
+                <param name="no_header" argument="--noheader" type="boolean" truevalue="--noheader" falsevalue="" label="Suppress header" help="Suppress output file's column headings" />
+                <param name="min_dna_id" argument="--minid" type="float" value="75" min="0" max="100" optional="true" label="Minimum DNA identity" />
+                <param name="cull_limit" argument="--cull" type="integer" value="1" min="0" optional="true" label="Culling limit (encompassing hits)" />
             </when>
         </conditional>
     </inputs>
 
     <outputs>
-        <data format="tabular" name="report" label="${tool.name} on ${on_string} report file"/>
+        <data name="report" format="tabular" label="${tool.name} on ${on_string} report file" />
     </outputs>
 
     <tests>
@@ -130,17 +125,16 @@
 	Klebsiella.fna  NC_021232.1 872545  872964  fosA    1-420/420   =============== 0   100.00  100.00
 	Klebsiella.fna  NC_021232.1 1381252 1382427 oqxA    1-1176/1176 =============== 0   100.00  99.32
 	Klebsiella.fna  NC_021232.1 2584899 2585759 blaSHV1 1-861/861   =============== 0   100.00  99.88
-
-
     ]]></help>
 
     <citations>
-      <citation type="bibtex">
-        @UNPUBLISHED{Seemann2016,
-        author = "Seemann T",
-        title = "ABRicate: mass screening of contigs for antiobiotic resistance genes",
-        year = "2016",
-        note = "https://github.com/tseemann/abricate"}
-      </citation>
+        <citation type="bibtex">
+@UNPUBLISHED{Seemann2016,
+    author = {Seemann, Torsten},
+    title = {ABRicate: mass screening of contigs for antiobiotic resistance genes},
+    year = {2016},
+    url = {https://github.com/tseemann/abricate},
+}
+        </citation>
     </citations>
 </tool>