--- a/macros.xml	Wed Jun 18 15:07:04 2014 -0400
+++ b/macros.xml	Thu Jun 19 10:12:00 2014 -0400
@@ -1,4 +1,11 @@
 <macros>
+    <xml name="requirements">
+        <requirements>
+            <requirement type="package" version="2.19.1">bedtools</requirement>
+        </requirements>
+        <version_command>bedtools --version</version_command>
+    </xml>
+    <token name="@WRAPPER_VERSION@">2.19</token>
     <xml name="stdio">
         <stdio>
             <!-- Anything other than zero is an error -->
@@ -29,14 +36,9 @@
         </conditional>
     </xml>
     <xml name="split">
-        <param name="split" type="boolean" checked="true" truevalue="-split" falsevalue="" label="Treat split/spliced BAM or BED12 entries as distinct BED intervals when computing coverage." help="If set, the coverage will be calculated based the spliced intervals only. For BAM files, this inspects the CIGAR N operation to infer the blocks for computing coverage. For BED12 files, this inspects the BlockCount, BlockStarts, and BlockEnds fields (i.e., columns 10,11,12). If this option is not set, coverage will be calculated based on the interval's START/END coordinates, and would include introns in the case of RNAseq data." />
-
-    </xml>
-    <xml name="requirements">
-        <requirements>
-            <requirement type="package" version="2.19.1">bedtools</requirement>
-        </requirements>
-        <version_command>bedtools --version</version_command>
+        <param name="split" type="boolean" checked="true" truevalue="-split" falsevalue="" 
+            label="Treat split/spliced BAM or BED12 entries as distinct BED intervals when computing coverage." 
+            help="If set, the coverage will be calculated based the spliced intervals only. For BAM files, this inspects the CIGAR N operation to infer the blocks for computing coverage. For BED12 files, this inspects the BlockCount, BlockStarts, and BlockEnds fields (i.e., columns 10,11,12). If this option is not set, coverage will be calculated based on the interval's START/END coordinates, and would include introns in the case of RNAseq data." />
     </xml>
     <xml name="genome">
         <param format="bed,vcf,gff,gff3" name="genome" type="data" label="Genome file" />
@@ -51,8 +53,8 @@
                 <param name="b" label="Give Value" type="integer" value="0"  />
             </when>
             <when value="lr">
-                <param name="l" label="The number of base pairs to subtract from the start coordinate" type="integer" value="0"  />
-                <param name="r" label="The number of base pairs to add to the end coordinate" type="integer" value="0"  />
+                <param name="l" label="The number of base pairs to subtract from the start coordinate" type="integer" value="0" />
+                <param name="r" label="The number of base pairs to add to the end coordinate" type="integer" value="0" />
             </when>
         </conditional>
     </xml>
@@ -71,9 +73,6 @@
             <option value="distinct">distinct (i.e., print a comma separated list) - numeric or text</option>
             <option value="concat">concat (i.e., print a comma separated list) - numeric or text</option>
     </xml>
-
-
-
     <token name="@REFERENCES@">
 ------