--- a/maxious-canberra-transit-feed/validation-results.html
+++ b/maxious-canberra-transit-feed/validation-results.html
@@ -28,58 +28,110 @@
 <br><br>
 <table>
 <tr><th class="header">Agencies:</th><td class="header"><a href="http://www.action.act.gov.au/">ACT Internal Omnibus Network (ACTION)</a></td></tr>
-<tr><th class="header">Routes:</th><td class="header">1</td></tr>
-<tr><th class="header">Stops:</th><td class="header">6</td></tr>
-<tr><th class="header">Trips:</th><td class="header">69</td></tr>
+<tr><th class="header">Routes:</th><td class="header">256</td></tr>
+<tr><th class="header">Stops:</th><td class="header">230</td></tr>
+<tr><th class="header">Trips:</th><td class="header">4133</td></tr>
 <tr><th class="header">Shapes:</th><td class="header">0</td></tr>
-<tr><th class="header">Effective:</th><td class="header">May 25, 2009 to June 01, 2010</td></tr>
+<tr><th class="header">Effective:</th><td class="header">May 25, 2009 to October 01, 2010</td></tr>
 </table>
 <br>
-During the upcoming service dates Sun Apr 18 to Mon May 31:
+During the upcoming service dates Thu Jun 24 to Sun Aug 22:
 <table>
-<tr><th class="header">Average trips per date:</th><td class="header">30</td></tr>
-<tr><th class="header">Most trips on a date:</th><td class="header">36, on 31 service dates (Mon Apr 19, Tue Apr 20, Wed Apr 21, ...)</td></tr>
-<tr><th class="header">Least trips on a date:</th><td class="header">16, on 7 service dates (Sun Apr 18, Sun Apr 25, Sun May 02, ...)</td></tr>
+<tr><th class="header">Average trips per date:</th><td class="header">2060</td></tr>
+<tr><th class="header">Most trips on a date:</th><td class="header">2620, on 42 service dates (Thu Jun 24, Fri Jun 25, Mon Jun 28, ...)</td></tr>
+<tr><th class="header">Least trips on a date:</th><td class="header">580, on 9 service dates (Sun Jun 27, Sun Jul 04, Sun Jul 11, ...)</td></tr>
 </table>
 <br>
 <span class="fail">Found these problems:</span>
 <table class="count_outside">
-<tr><td><span class="fail">3 errors</span></td><td><span class="fail">2 warnings</span></td></tr>
+<tr><td><span class="fail">69 warnings</span></td></tr>
 <tr><td>
-<table><tr><td>3</td><td><a href="#ErrorInvalidValue">Invalid Values</a></td></tr>
-</table>
-</td>
-<td>
-<table><tr><td>1</td><td><a href="#WarningExpirationDate">Expiration Date</a></td></tr>
-<tr><td>1</td><td><a href="#WarningStopsTooClose">Stops Too Close</a></td></tr>
+<table><tr><td>57</td><td><a href="#WarningInvalidValue">Invalid Values</a></td></tr>
+<tr><td>4</td><td><a href="#WarningOtherProblem">Other Problems</a></td></tr>
+<tr><td>8</td><td><a href="#WarningStopsTooClose">Stops Too Closes</a></td></tr>
 </table>
 </td>
 </table>
 <br><br>
-<h3 class="issueHeader">Errors:</h3><h4 class="issueHeader"><a name="ErrorInvalidValue">Invalid Value</a></h4><ul>
-<li><div class="problem">Invalid value 2010601 in field <code>date</code></div>in line 2 of <code>calendar.txt</code><br>
-<table class="dump"><tr><th>service_id</th><th>start_date</th><th>end_date</th><th>monday</th><th>tuesday</th><th>wednesday</th><th>thursday</th><th>friday</th><th>saturday</th><th>sunday</th></tr>
-<tr><td>sunday</td><td>20090525</td><td>20100601</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>1</td></tr></table>
-<br></li>
-<li><div class="problem">Invalid value 2010601 in field <code>date</code></div>in line 3 of <code>calendar.txt</code><br>
-<table class="dump"><tr><th>service_id</th><th>start_date</th><th>end_date</th><th>monday</th><th>tuesday</th><th>wednesday</th><th>thursday</th><th>friday</th><th>saturday</th><th>sunday</th></tr>
-<tr><td>weekday</td><td>20090525</td><td>20100601</td><td>1</td><td>1</td><td>1</td><td>1</td><td>1</td><td>0</td><td>0</td></tr></table>
-<br></li>
-<li><div class="problem">Invalid value 2010601 in field <code>date</code></div>in line 4 of <code>calendar.txt</code><br>
-<table class="dump"><tr><th>service_id</th><th>start_date</th><th>end_date</th><th>monday</th><th>tuesday</th><th>wednesday</th><th>thursday</th><th>friday</th><th>saturday</th><th>sunday</th></tr>
-<tr><td>saturday</td><td>20090525</td><td>20100601</td><td>0</td><td>0</td><td>0</td><td>0</td><td>0</td><td>1</td><td>0</td></tr></table>
-<br></li>
+<h3 class="issueHeader">Warnings:</h3><h4 class="issueHeader"><a name="WarningInvalidValue">Invalid Value</a></h4><ul>
+<li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "217" and "216".</div><br></li>
+<li><div class="problem">Invalid value to city interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "215" and "214".</div><br></li>
+<li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "213" and "212".</div><br></li>
+<li><div class="problem">Invalid value to city interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "211" and "210".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "219" and "218".</div><br></li>
+<li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "138" and "137".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "222" and "223".</div><br></li>
+<li><div class="problem">Invalid value to city interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "198" and "199".</div><br></li>
+<li><div class="problem">Invalid value to city interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "190" and "191".</div><br></li>
+<li><div class="problem">Invalid value to city interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "193" and "194".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "140" and "139".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "226" and "227".</div><br></li>
+<li><div class="problem">Invalid value to cameron ave bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "146" and "145".</div><br></li>
+<li><div class="problem">Invalid value to city interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "244" and "245".</div><br></li>
+<li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "240" and "241".</div><br></li>
+<li><div class="problem">Invalid value to lithgow st terminus fyshwick in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "242" and "243".</div><br></li>
+<li><div class="problem">Invalid value to bimberi centre in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "246" and "247".</div><br></li>
+<li><div class="problem">Invalid value to city interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "177" and "178".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "175" and "176".</div><br></li>
+<li><div class="problem">Invalid value to cooleman court in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "173" and "174".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "172" and "171".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "253" and "252".</div><br></li>
+<li><div class="problem">Invalid value to city interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "248" and "249".</div><br></li>
+<li><div class="problem">Invalid value to city interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "180" and "179".</div><br></li>
+<li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "181" and "182".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "184" and "183".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "188" and "187".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "196" and "195".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "221" and "220".</div><br></li>
+<li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "185" and "186".</div><br></li>
+<li><div class="problem">Invalid value to cameron ave bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "142" and "141".</div><br></li>
+<li><div class="problem">Invalid value to cooleman court in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "169" and "170".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "228" and "229".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "166" and "165".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "167" and "168".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "162" and "161".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "163" and "164".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "224" and "225".</div><br></li>
+<li><div class="problem">Invalid value to cameron ave bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "152" and "151".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "154" and "153".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "156" and "155".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "159" and "160".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "158" and "157".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "239" and "238".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "235" and "234".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "237" and "236".</div><br></li>
+<li><div class="problem">Invalid value to tuggeranong interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "231" and "230".</div><br></li>
+<li><div class="problem">Invalid value to woden interchange in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "233" and "232".</div><br></li>
+<li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "200" and "201".</div><br></li>
+<li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "202" and "203".</div><br></li>
+<li><div class="problem">Invalid value to gungahlin market place in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "204" and "205".</div><br></li>
+<li><div class="problem">Invalid value to cohen st bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "206" and "207".</div><br></li>
+<li><div class="problem">Invalid value to gungahlin market place in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "208" and "209".</div><br></li>
+<li><div class="problem">Invalid value to cameron ave bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "148" and "147".</div><br></li>
+<li><div class="problem">Invalid value to cameron ave bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "149" and "150".</div><br></li>
+<li><div class="problem">Invalid value to cameron ave bus station in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "144" and "143".</div><br></li>
+<li><div class="problem">Invalid value to alexander maconochie centre hume in field <code>route_long_name</code><br>The same combination of route_short_name and route_long_name shouldn't be used for more than one route, as it is for the for the two routes with IDs "250" and "251".</div><br></li>
 </ul>
-<h3 class="issueHeader">Warnings:</h3><h4 class="issueHeader"><a name="WarningExpirationDate">Expiration Date</a></h4><ul>
-<li><div class="problem">This feed will soon expire, on June 01, 2010</div><br></li>
+<h4 class="issueHeader"><a name="WarningOtherProblem">Other Problem</a></h4><ul>
+<li><div class="problem">The trip with the trip_id "2876" doesn't have any stop times defined.</div><br></li>
+<li><div class="problem">The trip with the trip_id "1945" doesn't have any stop times defined.</div><br></li>
+<li><div class="problem">The trip with the trip_id "2847" doesn't have any stop times defined.</div><br></li>
+<li><div class="problem">The trip with the trip_id "1921" doesn't have any stop times defined.</div><br></li>
 </ul>
 <h4 class="issueHeader"><a name="WarningStopsTooClose">Stops Too Close</a></h4><ul>
-<li><div class="problem">The stops "Civic Interchange Platform 5" (ID 1) and "Canberra House Southbound" (ID 4) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Lewis Luxton/Woodcock Dr" (ID 133) and "Woodcock/Clare Dennis" (ID 228) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Erindale Drive/Sternberg" (ID 76) and "Erindale Centre /Sternberg Crescent" (ID 74) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "City Interchange - Platform 1" (ID 39) and "City Interchange" (ID 38) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Cameron Ave Bus Station" (ID 20) and "Cameron Ave Bus Station - Platform 1" (ID 21) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Lathlain St Bus Station - Platform 4" (ID 130) and "Lathlain St Bus Station" (ID 126) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Cohen St Bus Station" (ID 51) and "Cohen St Bus Station - Platform 1" (ID 52) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Flemington/Nullabor" (ID 84) and "Flemington Rd/Sandford St" (ID 86) are 0.00m apart and probably represent the same location.</div><br></li>
+<li><div class="problem">The stops "Fraser East Terminus" (ID 90) and "Fraser" (ID 89) are 0.00m apart and probably represent the same location.</div><br></li>
 </ul>
 
 <div class="footer">
 Generated by <a href="http://code.google.com/p/googletransitdatafeed/wiki/FeedValidator">
-FeedValidator</a> version 1.2.5 on April 18, 2010 at 08:24 PM EST.
+FeedValidator</a> version 1.2.5 on June 24, 2010 at 12:28 AM EST.
 </div>
 </body>
 </html>