--- a/SMART/galaxy/compareOverlapping.xml	Fri Apr 19 10:13:11 2013 -0400
+++ b/SMART/galaxy/compareOverlapping.xml	Mon Apr 22 11:08:07 2013 -0400
@@ -1,4 +1,4 @@
-<tool id="CompareOverlapping" name="Compare Overlapping">
+<tool id="CompareOverlapping" name="compare Overlapping">
 	<description>Print all the transcripts from a first file which overlap with the transcripts from a second file.</description>
 	<command interpreter="python">
 		../Java/Python/CompareOverlapping.py -i $formatType.inputFileName1
@@ -107,7 +107,7 @@
 			</when>
 			<when value="gtf">
 				<param name="inputFileName1" format="gtf" type="data" label="Input File 1"/>
-								                        </when>
+			</when>
 		</conditional>
 
 		<conditional name="formatType2">
@@ -139,58 +139,54 @@
 			</when>
 		</conditional>
 
-
-
 		<conditional name="optionNFirstFile1">
-			<param name="NFirstForFile1" type="select" label="NFirst for file 1" help="only consider the n first nucleotides of the transcripts in file 1">
+			<param name="NFirstForFile1" type="select" label="Shrink the queries to their first N nt.">
 					<option value="Yes">Yes</option>
 					<option value="No" selected="true">No</option>
 			</param>
 			<when value="Yes">
-				<param name="firstNtFile1" type="integer" value="1" label="n first nucleotides for input file 1" />
+				<param name="firstNtFile1" type="integer" value="1" label="size" />
 			</when>
 			<when value="No">
 			</when>
 		</conditional>
 		<conditional name="optionNFirstFile2">
-			<param name="NFirstForFile2" type="select" label="NFirst for file 2" help="only consider the n first nucleotides of the transcripts in file 2">
+			<param name="NFirstForFile2" type="select" label="Shrink the references to their first N nt.">
 				<option value="Yes">Yes</option>
 				<option value="No" selected="true">No</option>
 			</param>
 			<when value="Yes">
-				<param name="firstNtFile2" type="integer" value="1" label="n first nucleotides for input file 1" />
+				<param name="firstNtFile2" type="integer" value="1" label="size" />
 			</when>
 			<when value="No">
 			</when>
 		</conditional>
 
 		<conditional name="optionNLastFile1">
-			<param name="NLastForFile1" type="select" label="NLast for file 1">
+			<param name="NLastForFile1" type="select" label="Shrink the queries to their last N nt.">
 					<option value="Yes">Yes</option>
 					<option value="No" selected="true">No</option>
 			</param>
 			<when value="Yes">
-				<param name="lastNtFile1" type="integer" value="1" label="n last nucleotides for input file 1" help="only consider the n last nucleotides of the transcripts in file 1"/>
+				<param name="lastNtFile1" type="integer" value="1" label="size"/>
 			</when>
 			<when value="No">
 			</when>
 		</conditional>
 		<conditional name="optionNLastFile2">
-			<param name="NLastForFile2" type="select" label="NLast for file 2">
+			<param name="NLastForFile2" type="select" label="Shrink the references to their last N nt.">
 				<option value="Yes">Yes</option>
 				<option value="No" selected="true">No</option>
 			</param>
 			<when value="Yes">
-				<param name="lastNtFile2" type="integer" value="1" label="n last nucleotides for input file 2" help="only consider the n last nucleotides of the transcripts in file 2"/>
+				<param name="lastNtFile2" type="integer" value="1" label="size"/>
 			</when>
 			<when value="No">
 			</when>
 		</conditional>
 
-
-
 		<conditional name="optionExtentionCinqFile1">
-			<param name="extentionFile1" type="select" label="Extension towards 5 for file 1">
+			<param name="extentionFile1" type="select" label="Extend the query features towards the 5' end">
 					<option value="Yes">Yes</option>
 					<option value="No" selected="true">No</option>
 			</param>
@@ -201,9 +197,8 @@
 			</when>
 		</conditional>
 
-
 		<conditional name="optionExtentionCinqFile2">
-			<param name="extentionFile2" type="select" label="Extension towards 5 for file 2">
+			<param name="extentionFile2" type="select" label="Extend the reference features towards 5' end">
 				<option value="Yes">Yes</option>
 				<option value="No" selected="true">No</option>
 			</param>
@@ -215,7 +210,7 @@
 		</conditional>
 
 		<conditional name="optionExtentionTroisFile1">
-			<param name="extentionFile1" type="select" label="Extension towards 3 for file 1">
+			<param name="extentionFile1" type="select" label="Extend the query features towards 3' end">
 					<option value="Yes">Yes</option>
 					<option value="No" selected="true">No</option>
 			</param>
@@ -227,7 +222,7 @@
 		</conditional>
 
 		<conditional name="optionExtentionTroisFile2">
-			<param name="extentionFile2" type="select" label="Extension towards 3 for file 2">
+			<param name="extentionFile2" type="select" label="Extend the reference features towards 3' end">
 				<option value="Yes">Yes</option>
 				<option value="No" selected="true">No</option>
 			</param>
@@ -239,7 +234,7 @@
 		</conditional>
 
 		<conditional name="OptionColinearOrAntiSens">
-			<param name="OptionCA" type="select" label="Colinear or anti-sens">
+			<param name="OptionCA" type="select" label="Report queries which are collinear/antisens w.r.t. a reference">
 				<option value="Colinear">Colinear</option>
 				<option value="AntiSens">AntiSens</option>
 				<option value="NONE" selected="true">NONE</option>
@@ -275,14 +270,38 @@
 			<when value="No">
 			</when>
 		</conditional>
-		<param name="InvertMatch" type="boolean" truevalue="-x" falsevalue="" checked="false" label="Invert match"/>
-		<param name="ReportIntron" type="boolean" truevalue="-t" falsevalue="" checked="false" label="Report intron"/>
-		<param name="NotOverlapping" type="boolean" truevalue="-O" falsevalue="" checked="false" label="When there is no overlapping, the number of Overlapping will be set to 0 by defalt."/>
+		<param name="ReportIntron" type="boolean" truevalue="-t" falsevalue="" checked="false" label="Also report queries which overlap with the introns of references, or queries such that a reference is in one of its intron"/>
+		<param name="InvertMatch" type="boolean" truevalue="-x" falsevalue="" checked="false" label="Invert match: the output file will contain all query elements which do NOT overlap"/>
+		<param name="NotOverlapping" type="boolean" truevalue="-O" falsevalue="" checked="false" label="Also report the query data which do not overlap, with the nbOverlaps tag set to 0."/>
+	</inputs>
 		
-	</inputs>
-
 	<outputs>
 		<data name="outputFileGff" format="gff3"/>
 	</outputs> 
 	
+	<help>
+This script may be the most important one. It basically compares two sets of transcripts and keeps those from the first set which overlap with the second one. The first set is considered as the query set (basically, your data) and the second one is the reference set (RefSeq data, for example).
+  
+It is vital to understand that it will output the elements of the first file which overlap with the elements of the second one.
+
+Various modifiers are also available:
+
+-Restrict query / reference set to the first nucleotide. Useful to check if the TSS of one set overlap with the other one.
+
+-Extend query / reference set on the 5' / 3' direction. Useful to check if one set is located upstream / downstream the other one.
+
+-Include introns in the comparison.
+
+-Invert selection (report those which do not overlap).
+
+-Restrict to colinear / anti-sense overlapping data.
+
+-Keep the query data even if they do not strictly overlap with the reference data, but are located not further away than *n* nucleotide from some reference data.
+
+-Keep the query data with are strictly included into reference data, meaning that a query transcript such that at least 1 nucleotide does not overlap with reference data will not be presented as a solution.
+
+The mechanism of shrinking and extending is also useful to make a fine grain comparison. For example, if you want to keep those such that the TSS is overlapping the reference set, you just shrink the query set to 1 nucleotide. Now, if you want to keep those which are overlapping you data or located 2kb downstream of it, just extend the query data in the downstream direction, and you will have what you want. You can also extend in the opposite direction to get the possible transcript factor sites which are upstream.
+
+Some option reverses the selection. Put in other words, it performs the comparison as usual, and outputs all those query data which do not overlap.
+	</help>
 </tool>