--- a/dexseq_count.xml	Sun Jan 29 06:59:35 2017 -0500
+++ b/dexseq_count.xml	Sun Jan 28 04:04:39 2018 -0500
@@ -1,9 +1,11 @@
-<tool id="dexseq_count" name="DEXSeq-Count" version="1.20.1">
+<tool id="dexseq_count" name="DEXSeq-Count" version="@VERSION@.0">
     <description>Prepare and count exon abundancies from RNA-seq data</description>
-    <requirements>
-        <requirement type="package" version="1.20.1">bioconductor-dexseq</requirement>
-        <requirement type="package" version="0.6.1.post1">htseq</requirement>
-    </requirements>
+    <macros>
+        <import>macros.xml</import>
+    </macros>
+    <expand macro="requirements">
+        <requirement type="package" version="0.9.1">htseq</requirement>
+    </expand>
     <stdio>
         <!-- Anything other than zero is an error -->
         <exit_code range="1:" />
@@ -12,26 +14,24 @@
         <regex match="Error:" />
         <regex match="Exception:" />
     </stdio>
-    <command>
-    <![CDATA[
-        #if $mode.mode_select == "prepare":
-            dexseq_prepare_annotation.py
-                -r $mode.aggregate
-                '$mode.gtffile'
-                '$flattened_gtf_out'
-        #elif $mode.mode_select == "count":
-            dexseq_count.py
-                -f bam
-                -p $mode.paired
-                -s $mode.stranded
-                -a $mode.qual
-                -r $mode.order
-                $mode.flattened_gtf_in
-                '$mode.bamfile'
-                '$counts_file'
-        #end if
-    ]]>
-    </command>
+    <command><![CDATA[
+#if $mode.mode_select == "prepare":
+    dexseq_prepare_annotation.py
+        -r $mode.aggregate
+        '$mode.gtffile'
+        '$flattened_gtf_out'
+#elif $mode.mode_select == "count":
+    dexseq_count.py
+        -f bam
+        -p $mode.paired
+        -s $mode.stranded
+        -a $mode.qual
+        -r $mode.order
+        $mode.flattened_gtf_in
+        '$mode.bamfile'
+        '$counts_file'
+#end if
+    ]]></command>
     <inputs>
         <conditional name="mode">
             <param name="mode_select" type="select" label="Mode of operation">
@@ -76,33 +76,31 @@
             <param name="mode_select" value="prepare" />
             <param name="gtffile" ftype="gff" value="original.gtf"/>
             <param name="aggregate" value="True"/>
-            <output name="flattened_gtf_out" file="flattened.gtf" ftype="gtf"/>
+            <output name="flattened_gtf_out" ftype="gtf" compare="sim_size" file="flattened.gtf"/>
         </test>
     </tests>
 
-    <help>
-    <![CDATA[
+    <help><![CDATA[
 .. class:: infomark
 
 **What it does**
 
-The main goal of this tol is to count the number of reads/fragments per exon of each gene in RNA-seq sample. In addition it also prepares your annotation gtf file compatible for counting.
+The main goal of this tool is to count the number of reads/fragments per exon of each gene in RNA-seq samples. In addition, it also prepares your annotation GTF file, making it compatible for counting.
 
 
 **Inputs**
 
-Mode-preprare: Takes a normal gtf file as input. For example from ensembl database.
-Mode-count: Inputs are flattened gtf file and BAM file. The flattened gtf file can be generated from 'prepare' mode of this tool.
+Mode-preprare: Takes a normal gtf file as input. For example from Ensembl database.
+Mode-count: Inputs are flattened GTF file and BAM file. The flattened GTF file can be generated from 'prepare' mode of this tool.
 
 **Output**
 
-Mode-preprare: Flattened gtf file that contains only exons with corresponding gene ids from given gtf file. Sometimes two or more genes sharing an exon will be merged into an 'aggregate gene' if the aggregate option was used.
-Mode-count: Two column tab-delimeted file with exon ids and their read counts.
+Mode-prepare: Flattened GTF file that contains only exons with corresponding gene ids from given GTF file. Sometimes two or more genes sharing an exon will be merged into an 'aggregate gene' if the aggregate option was used.
+Mode-count: Two column tab-delimited file with exon ids and their read counts.
 
 .. _DEXSeq: http://master.bioconductor.org/packages/release/bioc/html/DEXSeq.html
 
-    ]]>
-    </help>
+    ]]></help>
     <citations>
         <citation type="doi">10.1101/gr.133744.111</citation>
     </citations>