--- a/maxious-canberra-transit-feed/02-tidytimepoints.rb
+++ b/maxious-canberra-transit-feed/02-tidytimepoints.rb
@@ -19,17 +19,15 @@
 		end
 	}
 end
-
-getTimePoints()
-#pp $time_points.sort!
-#pp $time_points_sources.sort
-
+def correctTimePoints()
 time_point_corrections = {"North Lynehamham" => "North Lyneham",
-  "Woden Bus Station Platform 10)" => "Woden Bus Station (Platform 10)",
-  "Saint AndrewsVillage Hughes"=>"Saint Andrews Village Hughes",
+ "Woden Bus Station Platform 10)" => "Woden Bus Station (Platform 10)",
+ "Saint AndrewsVillage Hughes"=>"Saint Andrews Village Hughes",
  "Flemmington Road / Sandford St"=>"Flemington Road / Sandford St",
  "City Interchange"=>"City Bus Station",
  "City Interchange (Platform 9)"=>"City Bus Station (Platform 9)",
+ "City Bus Station Platfrom 9"=>"City Bus Station (Platform 9)",
+ "Belconnen Community Bus StationPlatform 2)"=>"Belconnen Community Bus Station (Platform 2)",
  "Bridbabella Gardens Nursing Home"=>"Brindabella Gardens Nursing Home",
  "Bridbabella GardensNursing Home"=> "Brindabella Gardens Nursing Home",
  "BrindabellaBusiness Park"=> "Brindabella Business Park",
@@ -37,31 +35,80 @@
  "Railway StationKingston"=>"Railway Station Kingston",
  "Saint AndrewsVillage Hughes"=>"Saint Andrews Village Hughes",
  "Dickson ShopsAntill Street"=>"Dickson Shops",
- "Cohen St Bus Station (Platform 3)"=>"Cohen Street Bus Station (Platform 3)",
- "Cohen St Bus Station (Platform 6)"=>"Cohen Street Bus Station (Platform 6)",
- "Newcastle Streetafter Isa Street"=>"Newcastle Street after Isa Street",
+ "Cohen St Bus Station (Platform 3)" => "Cohen Street Bus Station (Platform 3)",
+ "Cohen St Bus Station (Platform 6)" => "Cohen Street Bus Station (Platform 6)",
+ "Newcastle Streetafter Isa Street" => "Newcastle Street after Isa Street",
+ "Newcastle St after Isa St" => "Newcastle Street after Isa Street",
+ "Newcastle Street after Isa St" => "Newcastle Street after Isa Street",
+ "Northbourne Ave / Antill St" => "Northbourne Avenue / Antill St",
+ "Macarthur / Northbourne" => "Macarthur / Northbourne Ave",
+ "Macarthur Ave / Northbourne" => "Macarthur / Northbourne Ave",
+ "Kings Ave / National Cct"=> "Kings Ave / National Circuit",
+ "Kosciuszco Ave / Everard Street"=>"Kosciuszko / Everard",
+ "Lithgow St Terminus" => "Lithgow St Terminus Fyshwick",
+ "Hospice Menindee Dr" => "Hospice / Menindee Dr",
+ "Gungahlin Market Place"=> "Gungahlin Marketplace",
+ "Gwyder Square Kaleen"=> "Gwydir Square Kaleen",
+ "Flemington Road / Nullabor Ave"=>"Flemington Rd / Nullabor Ave",
+ "Flemington Road / Sandford St"=>"Flemington Rd / Sandford St",
+ "Heagney Cres Clift Cres Richardson"=>  "Heagney / Clift Richardson",
+ "Charnwood Shops (Tillyard Drive)"=> "Charnwood Shops",
+ "charnwood Shops"=> "Charnwood Shops",
+ "Black Moutain- Telstra Tower"=>"Black Mountain Telstra Tower",
+ "Bonython Primary"=> "Bonython Primary School",
+ "Athllon Drive / Sulwood Dr Kambah"=>"Athllon / Sulwood Kambah",
+ "Alexander Machonochie Centre Hume"=>"Alexander Maconochie Centre",
+ "Alexander Maconochie Centre Hume"=>"Alexander Maconochie Centre",
+ "Anthony Rolfe Ave / Moonight Ave" =>"Anthony Rolfe Av / Moonlight Av",
+ "Australian National Botanic Gardens"=>"Botanic Gardens",
+ "Calwell shops"=> "Calwell Shops", 
+ "Chuculba / William Slim Drive"=>"Chuculba / William Slim Dr",
+ "Fyshwick direct Factory Outlet"=>"Fyshwick Direct Factory Outlet",
+ "Kaleen Village / Maibrynong"=>"Kaleen Village / Marybrynong",
+ "Kaleen Village / Marybrynong Ave"=>"Kaleen Village / Marybrynong",
+ "National Aquarium"=>"National Zoo and Aquarium",
+ "chisholm Shops"=>"Chisholm Shops",
+ "O'connor Shops"=>"O'Connor Shops",
+ "Mckellar Shops"=>"McKellar Shops",
+ "Melba shops"=> "Melba Shops",
  "William Web / Ginninderra Drive"=>"William Webb / Ginninderra Drive",
  "Procor / Mead"=>"Proctor / Mead",
-"Fyshwick DirectFactory Outlet"=>"Fyshwick Direct Factory Outlet",
-"Dickson ShopsAntill Street"=>"Dickson Shops/Antill St",
-"Yarrulumla Shops"=>"Yarralumla Shops",
-"Tharwa Dr / Pocket Ave"=>"Tharwa Dr / Pockett Ave",
-"Paul Coe / Mirrebei Dr"=>"Paul Coe / Mirrabei Dr",
-"Mirrebei Drive / Dam Wall"=>"Mirrabei Drive / Dam Wall"
+ "Fyshwick DirectFactory Outlet"=>"Fyshwick Direct Factory Outlet",
+ "Yarrulumla Shops"=>"Yarralumla Shops",
+ "Tharwa Dr / Pocket Ave"=>"Tharwa Dr / Pockett Ave",
+ "Paul Coe / Mirrebei Dr"=>"Paul Coe / Mirrabei Dr",
+ "Mirrebei Drive / Dam Wall"=>"Mirrabei Drive / Dam Wall",
+ "Tharwa / Knoke" => "Tharwa Drive / Knoke Ave",
+ "Tharwa / Pocket" => "Tharwa Dr / Pockett Ave",
+ "Outrim / Duggan" => "Outtrim / Duggan",
+ "ANU Burton and Garran Hall Daley Rd" => "Burton and Garran Hall Daley Road",
+ "Farrer Primary"=>"Farrer Primary School",
+ "St Thomas More Campbell"=>"St Thomas More's Campbell",
+ "Lyneham Shops"=>"Lyneham Shops Wattle Street",
+ 
+ 
 }
-
-time_point_corrections.each do |wrong, right|
-	$time_points_sources[wrong].each do |wrongfile|
-		badtimetable = YAML::load_file(wrongfile)
-		badentrynumber = badtimetable["time_points"].index wrong
-		badtimetable["time_points"][badentrynumber] = right
-		puts "Corrected '" + wrong + "' to '" + right + "' in " + wrongfile
-		File.open(wrongfile, "w") do |f|
-	 		f.write badtimetable.to_yaml
+	time_point_corrections.each do |wrong, right|
+		$time_points_sources[wrong].each do |wrongfile|
+			badtimetable = YAML::load_file(wrongfile)
+			badentrynumber = badtimetable["time_points"].index wrong
+			badtimetable["time_points"][badentrynumber] = right
+			puts "Corrected '" + wrong + "' to '" + right + "' in " + wrongfile
+			File.open(wrongfile, "w") do |f|
+	 			f.write badtimetable.to_yaml
+			end
 		end
 	end
 end
 
 getTimePoints()
+#pp $time_points.sort!
+#pp $time_points_sources.sort
+
+
+correctTimePoints()
+getTimePoints()
+correctTimePoints()
+getTimePoints()
 pp $time_points.sort!