diff --git a/running/index.mdwn b/running/index.mdwn
index 2b574af..daf6a1e 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -95,7 +95,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 27. May 26, 2019, Three Peaks Race 2, 1h58m, 2nd= (with Tim and Lindsay) [[!strava 2397245475]]
 28. June 16, 2019, Three Peaks Race 3, 1h42, 1st= (With Matthew) [[!strava 2453129333]]
 29. June 22, 2019, [[Galashiels Trophy/Novice Cup|https://www.facebook.com/download/2231464843738002/Galashiels%202019.pdf?av=1572305761&eav=AfYe8E7Hw0pJiZVKs5TBsuBSYkTsFx6k3VVYE7Mk1uv5m1SDgI56e18R1efp4MOXQvc&hash=Acqz7uplf_itxNWP]], 17.52, 9th on handicap, 2nd on actual time [[!strava 2469722986]]
-30. June 30, 2019, [[Wellington Half Marathon|https://results.timingsports.com/list/wellingtonmarathon/2019/21R/], 1h18m36s, 20th [[!strava 2491049758]] PB
+30. June 30, 2019, [[Wellington Half Marathon|https://results.timingsports.com/list/wellingtonmarathon/2019/21R/]], 1h18m36s, 20th [[!strava 2491049758]] PB
 22. July 13, 2019, [[WUU2K (43km)|https://www.tridentresults.com/event/499/results?round=2608]], 3h51m45s, 1st CR [[!strava 2526878729]]
 31. July 20, 2019, [[Wellington XC Champs|https://www.webscorer.com/race?raceid=188548]], 39m06s, 22nd [[!strava 2546661714]]
 

diff --git a/running/index.mdwn b/running/index.mdwn
index 861ed1b..2b574af 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -92,8 +92,13 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 26. May 18, 2019, [[Scottish Mountain Championships|http://www.scottishathletics.org.nz/News/scottish-mountain-running-champs-results]], 29m08s, 1st [[!strava 2376046115]]
 27. May 19, 2019, [[Honest 10|http://whac.org.nz/wp/honest-10/results-2/#Results_for_Winter_Series_Race_One_19_May_2019]], 36m38s, 7th [[!strava 2378507070]]
 27. May 25, 2019, [[Vosseler Shield|http://athleticswellington.org.nz/wp-content/uploads/2019/05/ResultsVosseler2019v2.pdf]], 46m16s, 10th [[!strava 2394670617]]
-27. May 26, 2019 Three Peaks Race 2, 1h58m, 2nd= (with Tim and Lindsay) [[!strava 2397245475]]
-22. July 13, 2019, WUU2K (43km)
+27. May 26, 2019, Three Peaks Race 2, 1h58m, 2nd= (with Tim and Lindsay) [[!strava 2397245475]]
+28. June 16, 2019, Three Peaks Race 3, 1h42, 1st= (With Matthew) [[!strava 2453129333]]
+29. June 22, 2019, [[Galashiels Trophy/Novice Cup|https://www.facebook.com/download/2231464843738002/Galashiels%202019.pdf?av=1572305761&eav=AfYe8E7Hw0pJiZVKs5TBsuBSYkTsFx6k3VVYE7Mk1uv5m1SDgI56e18R1efp4MOXQvc&hash=Acqz7uplf_itxNWP]], 17.52, 9th on handicap, 2nd on actual time [[!strava 2469722986]]
+30. June 30, 2019, [[Wellington Half Marathon|https://results.timingsports.com/list/wellingtonmarathon/2019/21R/], 1h18m36s, 20th [[!strava 2491049758]] PB
+22. July 13, 2019, [[WUU2K (43km)|https://www.tridentresults.com/event/499/results?round=2608]], 3h51m45s, 1st CR [[!strava 2526878729]]
+31. July 20, 2019, [[Wellington XC Champs|https://www.webscorer.com/race?raceid=188548]], 39m06s, 22nd [[!strava 2546661714]]
+
 
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].
 
@@ -106,7 +111,7 @@ parkrun | 16m56s | Hull parkrun, 2018
 5000m | 17m30.24s | Wellington 5000m Champs, 2019
 10k | 35m20s | Coniston 10k, 2018
 10m | 59m55s | Gilberdye 10, 2017
-1/2 Marathon | 1h19m56s | Five Bridges Half Marathon, 2018
+1/2 Marathon | 1h18536s | Wellington Half Marathon, 2019
 20m | 2h10m21s | East Hull 20, 2018
 Marathon | 2h48m16s | Loch Ness Marathon, 2017
 """]]

diff --git a/running/index.mdwn b/running/index.mdwn
index be29745..861ed1b 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -33,52 +33,66 @@ So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a fe
 8. May 8, 2016 [[Beverley 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=108&bib=498]] in 37m39s, 22nd overall [[!strava 569320624]] PB
 9. Jun 11, 2016 [[Kirkstall Abbey Trail Half Marathon|https://racebest.com/results/queens-birthday-bash-kirkstall-trail-race]], 1st place, 1h25m26s [[!strava 605764686]] PB
 10. Jun 26, 2016 [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=119&bib=299]], 1h22m59s, 21st overall [[!strava 621273867]] PB
-11. July 13, 2016 [[Doncaster Town Centre 5k|http://www.sportstimingsolutions.co.uk/rcd.php?id=125&bib=574]], 17m28s, 42nd overall, [[!strava 639933310]] PB
-12. July 15, 2016, [[Walkington 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=127&bib=322]], 37m24s, 15th overall, [[!strava 642011439]] PB
-13. Septemper 18, 2016 [[Hull Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=137&bib=524]], 2h56m11s, 11th overall, [[!strava 716360558]] PB
+11. July 13, 2016 [[Doncaster Town Centre 5k|http://www.sportstimingsolutions.co.uk/rcd.php?id=125&bib=574]], 17m28s, 42nd overall [[!strava 639933310]] PB
+12. July 15, 2016, [[Walkington 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=127&bib=322]], 37m24s, 15th overall [[!strava 642011439]] PB
+13. Septemper 18, 2016 [[Hull Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=137&bib=524]], 2h56m11s, 11th overall [[!strava 716360558]] PB
 
 Since the Hull Marathon (beat my target), I'm just running for fun, no particular goals. Some races:
 
-14. October 30, 2016 Haltemprice 10k, 37m03s, 7th overall, [[!strava 760492671]] PB (got a bit lost and missed a turn, so added ~20-30s and lost a place)
-14. December 11, 2016, [[Tinsel Turbary Trail Race 7.5m|https://www.docdroid.net/DvG0Pkf/tinsel-turbary-trail-2016-full-results.pdf.html]] 47m26s, 5th overall, [[!strava 799401319]]
-15. December 31, 2016 [[Silvesterlauf|http://www.berliner-silvesterlauf.de/der-tag-/ergebnisarchiv.html]], 38m16s, 16th overall, [[!strava 816680295]]
-16. January 29, 2017, [[Ferriby 10 Mile|http://www.sportstimingsolutions.co.uk/rcd.php?id=159&bib=19]] 1h00m16s, 23rd overall, [[!strava 848023739]]
-17. February 5, 2017, [[Dewsbury 10k|http://tdleventservices.co.uk/race-results-individual.php?event=2481&competitor_id=735]], 36m12s, 49th overall, [[!strava 855705384]] PB
+14. October 30, 2016 Haltemprice 10k, 37m03s, 7th overall [[!strava 760492671]] PB (got a bit lost and missed a turn, so added ~20-30s and lost a place)
+14. December 11, 2016, [[Tinsel Turbary Trail Race 7.5m|https://www.docdroid.net/DvG0Pkf/tinsel-turbary-trail-2016-full-results.pdf.html]] 47m26s, 5th overall [[!strava 799401319]]
+15. December 31, 2016 [[Silvesterlauf|http://www.berliner-silvesterlauf.de/der-tag-/ergebnisarchiv.html]], 38m16s, 16th overall [[!strava 816680295]]
+16. January 29, 2017, [[Ferriby 10 Mile|http://www.sportstimingsolutions.co.uk/rcd.php?id=159&bib=19]] 1h00m16s, 23rd overall [[!strava 848023739]]
+17. February 5, 2017, [[Dewsbury 10k|http://tdleventservices.co.uk/race-results-individual.php?event=2481&competitor_id=735]], 36m12s, 49th overall [[!strava 855705384]] PB
 18. March 19, 2017, [[East Hull 20 Mile|http://sportstimingsolutions.co.uk/rcd.php?id=164&bib=616]], 2h15m00s, 44th overall [[!strava 906176218]] (probably shouldn't have run, was injured :(  )
 19. (Didn't run; injured. I marshalled instead) April 1, 2017, Temple Newsam Trail Marathon
 19. May 7, 2017, [[North Lincolnshire Half Marathon|http://www.stuweb.co.uk/race/1w4/1293.html]], 1h22m04s, 41st overall [[!strava 974707741]] (still recovering from injury so not going full effort) PB
 19. (Didn't run, back in NZ) May 14, 2017, Beverley 10k
 19. May 28, 2017, [[Humber Bridge 10k|https://www.dotgo.uk/shared/images/content/bus_53019/pdf/Humber_Bridge_10k_2017_Reults.pdf]], 38m14s, 9th overall (1st non-PB 10k race :( ) [[!strava 1009298804]]
-20. June 25, 2017, [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=189&bib=99]], 1h22m03s, 17th overall, [[!strava 1053049202]],PB
-20. July 8, 2017, [[Summer Extravaganza Half Marathon|https://racebest.com/results/canal-canter-summer-extravaganza]], 1h21m35s, 1st, [[!strava 1073084603]] PB
-20. July 12, 2017, [[Doncaster Town Centre 5k|http://sportstimingsolutions.co.uk/rcd.php?id=197&bib=308]], 17m28s, 54th overall, [[!strava 1080394107]]
-20. July 14, 2017, [[Walkington 10k|http://sportstimingsolutions.co.uk/rcd.php?id=199&bib=135]], 37m04s, 10th overall, [[!strava 1083430598]] Course PB
-21. July 30, 2017, [[Grimsby 10k|http://www.stuweb.co.uk/race/1uV/2522.html]]  36m37s, 29th overall, [[!strava 1108422562]]
-21. August 27, 2017, [[Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m55s, 8th overall, [[!strava 1154617931]] PB
-21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall, [[!strava 1199273481]] PB
-21. October 14, 2017, [[Gruesome Twosome Half Marathon|https://tape2tape.co.uk/wp-content/uploads/2016/06/Gruesome-Twosome-Half-2017-Results.xlsx]] with Mike Potter, 1h40m33s, 17th pair, [[!strava 1229547312]]
-21. October 29, 2017, [[Haltemprice 10k|http://www.cityofhullac.co.uk/userfiles/files/Haltemprice%2010k/Haltemprice-10k-2017-Results%20(1).xls]], 36m22s, 5th, [[!strava 1252179808]], Course PB
-22. November 11, 2017, [[Hardmoors 26.2 Goathland Trail Marathon|https://www.hardmoors110.org.uk/hardmoors-26-2-goathland-trail-marathon/]], 3h43m00s, 1st(!), [[!strava 1270567865]]
-22. December 10, 2017, [[Tinsel Turbary Trail Race|http://docdro.id/6HTXzh3]], 47m45s, 1st, [[!strava 1309085523]]
-22. December 31, 2017, [[Silvesterlauf|https://www.berliner-silvesterlauf.de/der-tag/ergebnisliste.html]], 38m14s, 12th, [[!strava 1334567461]] PB
-22. January 28, 2018, [[Ferriby 10|http://www.sportstimingsolutions.co.uk/rcd.php?id=224&bib=10]], 63m11s, 38th, [[!strava 1379343992]]
-22. February 4, 2018, [[Dewsbury 10k|https://www.tdleventservices.co.uk/event-results/individual?event=2807&racenumber=8]], 37m10s, 101st, [[!strava 1390729842]]
-22. March 25, 2018 [[East Hull 20|http://www.sportstimingsolutions.co.uk/rcd.php?id=228&bib=627]], 2h10m21s, 25th, [[!strava 1470759745]] PB
-22. March 30, 2018 [[Good Friday Hill Race "7 Miles with 7 Hills"|http://easthullharriers.com/wp-content/uploads/2018/03/EHH-Winter-League-6-Brantingham-7-Mile.pdf]], 52m07s, 3rd, [[!strava 1479416565]]
-22. May 13, 2018, [[Beverley 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=240&bib=133]], 35m51s, 17th, [[!strava 1569226471]] PB
-22. May 20, 2018, [[Ravenscar Half Marathon|http://www.srmrt.org.uk/wp-content/uploads/2018/05/Ravenscar-HM-2018.pdf]], 1h30m26s, 1st, [[!strava 1583806225]]
-22. May 27, 2018, Wolds Way Relay, 2nd team overall and 1st mixed in 10h55m, I ran 2nd leg in 58m27s, [[!strava 1598678387]]
-22. June 3, 2018, [[Top of the Wolds 10k|https://runbritainrankings.com/results/results.aspx?meetingid=242395]], 37m48s, 4th, [[!strava 1613892733]]
-22. June 17, 2018, [[Burton Pidsea 10k|https://runbritainrankings.com/results/results.aspx?meetingid=243356]], 36m13s, 3rd, [[!strava 1644026275]]
-22. June 26, 2017, [[Coniston 10k (East Hull Harriers Summer League)|https://runbritainrankings.com/results/results.aspx?meetingid=236200]], 35m20s, 4th, [[!strava 1663992266]] PB
-22. July 10, 2018 Baltrumlauf (5.35km, no results), 19m19s, 1st, [[!strava 1693494551]]
-22. August 19, 2018, [[Five Bridges Half Marathon|http://capitalmultisports.co.nz/application/files/6415/3664/7938/Final_results_8_2018.pdf]], 1h19m56s, 1st, [[!strava 1781553788]] PB
-22. September 16, 2018, [[Berlin Marathon|http://results.scc-events.com/2018/?content=detail&event=MAL&idp=99999905C9AF60000044CF4A]], 2h49m55s, 709th, [[!strava 1845063595]]
-22. October 21, 2018 [[Honest 10|http://whac.org.nz/wp/honest-10/results/]], 38m14s, 2nd, [[!strava 1917157693]]
-22. November 18, 2018, [[Honest 10|http://whac.org.nz/wp/honest-10/results-2/#Results_for_Summer_Series_Race_One_18_November_2018]], 37m27s, 1st, [[!strava 1970490725]]
-22. January 26, 2019, [[Jumbo-Holdsworth Trail Race|http://jumbo-holdsworth.co.nz/content/results/2019-All-Final-Results_JHTR_26-01-2019.pdf]], 2h56m56s, 12th, [[!strava 2103317577]] PB
-22. February 17, 2019, [[Round the Bays|https://spw-results.tiktok.events/result/roundthebays/2019/30341/]] 1h19m59s, 17th, [[!strava 2153948876]] Course PB
-22. March 9, 2019, Tararua Mountain Race
+20. June 25, 2017, [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=189&bib=99]], 1h22m03s, 17th overall [[!strava 1053049202]],PB
+20. July 8, 2017, [[Summer Extravaganza Half Marathon|https://racebest.com/results/canal-canter-summer-extravaganza]], 1h21m35s, 1st [[!strava 1073084603]] PB
+20. July 12, 2017, [[Doncaster Town Centre 5k|http://sportstimingsolutions.co.uk/rcd.php?id=197&bib=308]], 17m28s, 54th overall [[!strava 1080394107]]
+20. July 14, 2017, [[Walkington 10k|http://sportstimingsolutions.co.uk/rcd.php?id=199&bib=135]], 37m04s, 10th overall [[!strava 1083430598]] Course PB
+21. July 30, 2017, [[Grimsby 10k|http://www.stuweb.co.uk/race/1uV/2522.html]]  36m37s, 29th overall [[!strava 1108422562]]
+21. August 27, 2017, [[Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m55s, 8th overall [[!strava 1154617931]] PB
+21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall [[!strava 1199273481]] PB
+21. October 14, 2017, [[Gruesome Twosome Half Marathon|https://tape2tape.co.uk/wp-content/uploads/2016/06/Gruesome-Twosome-Half-2017-Results.xlsx]] with Mike Potter, 1h40m33s, 17th pair [[!strava 1229547312]]
+21. October 29, 2017, [[Haltemprice 10k|http://www.cityofhullac.co.uk/userfiles/files/Haltemprice%2010k/Haltemprice-10k-2017-Results%20(1).xls]], 36m22s, 5th [[!strava 1252179808]], Course PB
+22. November 11, 2017, [[Hardmoors 26.2 Goathland Trail Marathon|https://www.hardmoors110.org.uk/hardmoors-26-2-goathland-trail-marathon/]], 3h43m00s, 1st(!) [[!strava 1270567865]]
+22. December 10, 2017, [[Tinsel Turbary Trail Race|http://docdro.id/6HTXzh3]], 47m45s, 1st [[!strava 1309085523]]
+22. December 31, 2017, [[Silvesterlauf|https://www.berliner-silvesterlauf.de/der-tag/ergebnisliste.html]], 38m14s, 12th [[!strava 1334567461]] PB
+22. January 28, 2018, [[Ferriby 10|http://www.sportstimingsolutions.co.uk/rcd.php?id=224&bib=10]], 63m11s, 38th [[!strava 1379343992]]
+22. February 4, 2018, [[Dewsbury 10k|https://www.tdleventservices.co.uk/event-results/individual?event=2807&racenumber=8]], 37m10s, 101st [[!strava 1390729842]]
+22. March 25, 2018 [[East Hull 20|http://www.sportstimingsolutions.co.uk/rcd.php?id=228&bib=627]], 2h10m21s, 25th [[!strava 1470759745]] PB
+22. March 30, 2018 [[Good Friday Hill Race "7 Miles with 7 Hills"|http://easthullharriers.com/wp-content/uploads/2018/03/EHH-Winter-League-6-Brantingham-7-Mile.pdf]], 52m07s, 3rd [[!strava 1479416565]]
+22. May 13, 2018, [[Beverley 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=240&bib=133]], 35m51s, 17th [[!strava 1569226471]] PB
+22. May 20, 2018, [[Ravenscar Half Marathon|http://www.srmrt.org.uk/wp-content/uploads/2018/05/Ravenscar-HM-2018.pdf]], 1h30m26s, 1st [[!strava 1583806225]]
+22. May 27, 2018, Wolds Way Relay, 2nd team overall and 1st mixed in 10h55m, I ran 2nd leg in 58m27s [[!strava 1598678387]]
+22. June 3, 2018, [[Top of the Wolds 10k|https://runbritainrankings.com/results/results.aspx?meetingid=242395]], 37m48s, 4th [[!strava 1613892733]]
+22. June 17, 2018, [[Burton Pidsea 10k|https://runbritainrankings.com/results/results.aspx?meetingid=243356]], 36m13s, 3rd [[!strava 1644026275]]
+22. June 26, 2017, [[Coniston 10k (East Hull Harriers Summer League)|https://runbritainrankings.com/results/results.aspx?meetingid=236200]], 35m20s, 4th [[!strava 1663992266]] PB
+22. July 10, 2018 Baltrumlauf (5.35km, no results), 19m19s, 1st [[!strava 1693494551]]
+22. August 19, 2018, [[Five Bridges Half Marathon|http://capitalmultisports.co.nz/application/files/6415/3664/7938/Final_results_8_2018.pdf]], 1h19m56s, 1st [[!strava 1781553788]] PB
+22. September 16, 2018, [[Berlin Marathon|http://results.scc-events.com/2018/?content=detail&event=MAL&idp=99999905C9AF60000044CF4A]], 2h49m55s, 709th [[!strava 1845063595]]
+22. October 21, 2018 [[Honest 10|http://whac.org.nz/wp/honest-10/results/]], 38m14s, 2nd [[!strava 1917157693]]
+22. November 18, 2018, [[Honest 10|http://whac.org.nz/wp/honest-10/results-2/#Results_for_Summer_Series_Race_One_18_November_2018]], 37m27s, 1st [[!strava 1970490725]]
+22. January 26, 2019, [[Jumbo-Holdsworth Trail Race|http://jumbo-holdsworth.co.nz/content/results/2019-All-Final-Results_JHTR_26-01-2019.pdf]], 2h56m56s, 12th [[!strava 2103317577]] PB
+22. February 17, 2019, [[Round the Bays|https://spw-results.tiktok.events/result/roundthebays/2019/30341/]] 1h19m59s, 17th [[!strava 2153948876]] Course PB
+23. February 26, 2019, [[Waterfront 5k|http://results.waterfront5k.nz/detail/?rid=527]] 17m43s, 6th [[!strava 2175889695]]
+22. March 9, 2019, [[Tararua Mountain Race|http://tmr.org.nz/.cm4all/uproc.php/0/Results/2019.pdf?cdp=a&_=16975e99848]] 6h36m55s, 21st, [[!strava 2200414596]]
+24. March 16, 2019, McVilly Shield (relay, 3x1km for me), 34m01s for 10km for the team 37m01s after handicap, 1st team [[!strava 2215528380]]
+23. March 19, 2019, [[Waterfront 5k|http://results.waterfront5k.nz/detail/?rid=530]] 17m29s, 4th [[!strava 2223606765]] Course PB
+23. March 24, 2019, [[Xterra West Wind|https://www.tridentresults.com/event/458/results]], 1h41m35s (results seem to be wrong, see strava for correct time), 5th [[!strava 2235546100]]
+23. February 26, 2019, [[Waterfront 5k|http://results.waterfront5k.nz/detail/?rid=531]] 17m26s, 5th [[!strava 2241118459]] PB
+23. March 30, 2019 [[Wellington 5000m Championships|http://athleticswellington.org.nz/wp-content/uploads/2019/04/club-meet-a-inc-wgtn-5000m-results-30-march-2019v2.pdf]], 17m30.24s, 5th (B race) [[!strava 2250660816]]
+23. April 13, 2019, [[New Zealand Mountain Running Championships|http://athleticswellington.org.nz/wp-content/uploads/2019/05/NZ-Mountain-RUnning-Champs-April-2019-Results.pdf]] 57m17s, 16th [[!strava 2285390907]]
+23. April 27, 2019, [[Shaw Baton Relays|http://athleticswellington.org.nz/wp-content/uploads/2019/05/Shaw-Baton-Relays-Results-2019.pdf]], 2km-lap relay, me in 7m18s, team in 28m08s, my lap 25th fastest, team 5th [[!strava 2321670259]]
+24. April 28, 2019, Three Peaks Race 1, 1h52m, 1st= (with Tim and Rowan) [[!strava 2323867789]]
+25. May 11, 2019, [[Auckland GP Race 1 (Pukekohe XC)|http://www.athleticsauckland.co.nz/Portals/5/XC/XCR%202019/gp1%20results%20Pukekohe.pdf]], 30m55s, 9th (SM) [[!strava 2357492706]]
+26. May 18, 2019, [[Scottish Mountain Championships|http://www.scottishathletics.org.nz/News/scottish-mountain-running-champs-results]], 29m08s, 1st [[!strava 2376046115]]
+27. May 19, 2019, [[Honest 10|http://whac.org.nz/wp/honest-10/results-2/#Results_for_Winter_Series_Race_One_19_May_2019]], 36m38s, 7th [[!strava 2378507070]]
+27. May 25, 2019, [[Vosseler Shield|http://athleticswellington.org.nz/wp-content/uploads/2019/05/ResultsVosseler2019v2.pdf]], 46m16s, 10th [[!strava 2394670617]]
+27. May 26, 2019 Three Peaks Race 2, 1h58m, 2nd= (with Tim and Lindsay) [[!strava 2397245475]]
 22. July 13, 2019, WUU2K (43km)
 
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].
@@ -87,8 +101,9 @@ I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/result
 
 [[!table data="""
 Distance | Time | Race
-parkrun | 16m56s | Hull parkrun
-5k | 17m28s | Doncaster Town Centre 5k, 2016
+parkrun | 16m56s | Hull parkrun, 2018
+5k | 17m26s | Waterfront 5k, 2019
+5000m | 17m30.24s | Wellington 5000m Champs, 2019
 10k | 35m20s | Coniston 10k, 2018
 10m | 59m55s | Gilberdye 10, 2017
 1/2 Marathon | 1h19m56s | Five Bridges Half Marathon, 2018

diff --git a/posts/Backup_solution.mdwn b/posts/Backup_solution.mdwn
index c025b51..17ae1ac 100644
--- a/posts/Backup_solution.mdwn
+++ b/posts/Backup_solution.mdwn
@@ -60,7 +60,7 @@ This file defines parameters needed to access the repository. Obviously, if not
     	then
     		echo "Backup succeeeded [$RESTIC_REPOSITORY]"
     		touch "$TOUCH_FILE"
-    		./forget.sh
+    		$HOME/scripts/forget.sh
     	else
     		echo "Problem with backup [$RESTIC_REPOSITORY]"
     		exit 2

diff --git a/running/index.mdwn b/running/index.mdwn
index 153c9db..be29745 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -77,7 +77,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. October 21, 2018 [[Honest 10|http://whac.org.nz/wp/honest-10/results/]], 38m14s, 2nd, [[!strava 1917157693]]
 22. November 18, 2018, [[Honest 10|http://whac.org.nz/wp/honest-10/results-2/#Results_for_Summer_Series_Race_One_18_November_2018]], 37m27s, 1st, [[!strava 1970490725]]
 22. January 26, 2019, [[Jumbo-Holdsworth Trail Race|http://jumbo-holdsworth.co.nz/content/results/2019-All-Final-Results_JHTR_26-01-2019.pdf]], 2h56m56s, 12th, [[!strava 2103317577]] PB
-22. February 17, 2019, [[Round the Bays|https://spw-results.tiktok.events/result/roundthebays/2019/30341/]] 1h19m59s, 17th, [[!strava https://www.strava.com/activities/2153948876]] Course PB
+22. February 17, 2019, [[Round the Bays|https://spw-results.tiktok.events/result/roundthebays/2019/30341/]] 1h19m59s, 17th, [[!strava 2153948876]] Course PB
 22. March 9, 2019, Tararua Mountain Race
 22. July 13, 2019, WUU2K (43km)
 

diff --git a/running/index.mdwn b/running/index.mdwn
index a862134..153c9db 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -77,7 +77,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. October 21, 2018 [[Honest 10|http://whac.org.nz/wp/honest-10/results/]], 38m14s, 2nd, [[!strava 1917157693]]
 22. November 18, 2018, [[Honest 10|http://whac.org.nz/wp/honest-10/results-2/#Results_for_Summer_Series_Race_One_18_November_2018]], 37m27s, 1st, [[!strava 1970490725]]
 22. January 26, 2019, [[Jumbo-Holdsworth Trail Race|http://jumbo-holdsworth.co.nz/content/results/2019-All-Final-Results_JHTR_26-01-2019.pdf]], 2h56m56s, 12th, [[!strava 2103317577]] PB
-22. February 17, 2019, Round the Bays
+22. February 17, 2019, [[Round the Bays|https://spw-results.tiktok.events/result/roundthebays/2019/30341/]] 1h19m59s, 17th, [[!strava https://www.strava.com/activities/2153948876]] Course PB
 22. March 9, 2019, Tararua Mountain Race
 22. July 13, 2019, WUU2K (43km)
 

diff --git a/posts/Backup_solution.mdwn b/posts/Backup_solution.mdwn
index 46b86d2..c025b51 100644
--- a/posts/Backup_solution.mdwn
+++ b/posts/Backup_solution.mdwn
@@ -132,6 +132,7 @@ I also am using *systemd* to run them.
 These systemd user service and timer files work for me. But, I would say this was the hardest part of all of this. Specifically, this service will run on startup if the computer was off (or asleep, etc) when it was scheduled. But, it will run before the network is properly connected, and so fail. That is what the After, Wants lines are meant for. But, they don't work properly (or I don't understand what they mean exactly). Hence I added the *Restart=on-failure*, so it will retry 60s later in that case. I assume there is a better way to do this.
 
 For backing up to USB HDD, I have replaced the last block with
+
     [Install]
     WantedBy=dev-disk-by\x2duuid-MY_UUID.device
 and removed the After, Wants lines, in backup-HDD.service (and corresponding backup-HDD.timer). Thus, it runs the script every 30 minutes, and whenever the device is connected (which is preferable for an external drive).

diff --git a/posts/Backup_solution.mdwn b/posts/Backup_solution.mdwn
index 7b2f850..46b86d2 100644
--- a/posts/Backup_solution.mdwn
+++ b/posts/Backup_solution.mdwn
@@ -157,9 +157,9 @@ so that it would have access to all files. This way, I can avoid running as root
 
 Some sites I found helpful in doing this:
 
-* https://www.digitalocean.com/community/tutorials/how-to-back-up-data-to-an-object-storage-service-with-the-restic-backup-client
-* https://jpmens.net/2017/08/22/my-backup-software-of-choice-restic/
-* https://blog.filippo.io/restic-cryptography/
-* https://restic.org
-* https://restic.readthedocs.io/en/latest/080_examples.html
+* <https://www.digitalocean.com/community/tutorials/how-to-back-up-data-to-an-object-storage-service-with-the-restic-backup-client>
+* <https://jpmens.net/2017/08/22/my-backup-software-of-choice-restic/>
+* <https://blog.filippo.io/restic-cryptography/>
+* <https://restic.org>
+* <https://restic.readthedocs.io/en/latest/080_examples.html>
 [[!tag tech]]

diff --git a/posts/Backup_solution.mdwn b/posts/Backup_solution.mdwn
index 56db223..7b2f850 100644
--- a/posts/Backup_solution.mdwn
+++ b/posts/Backup_solution.mdwn
@@ -22,6 +22,7 @@ I want this to just run in the background, so I am using *systemd* timers to run
 Here are the contents of a few files
 
 ~/scripts/restic-env-S3.sh
+
     #!/bin/sh
     
     export RESTIC_REPOSITORY="s3:https://s3.amazonaws.com/MY_BUCKET_NAME"
@@ -31,13 +32,14 @@ Here are the contents of a few files
 This file defines parameters needed to access the repository. Obviously, if not using Amazon S3, the RESTIC_REPOSITORY format will be different. I have one of these files for S3, and one for my USB HDD.
 
 ~/scripts/backup.sh
+
     #!/bin/sh
     
     #Must pass as argument the env file
     . $1
     if [ "x$RESTIC_REPOSITORY" = "x" ]; then
-        	echo "RESTIC_REPOSITORY must be set"
-        	exit 1
+       	echo "RESTIC_REPOSITORY must be set"
+       	exit 1
     fi
     FORCE_BACKUP=0
     if [ "x$OVERRIDE_TIMESTAMP_CHK" = "x1" ]; then
@@ -52,9 +54,9 @@ This file defines parameters needed to access the repository. Obviously, if not
     FRECENT=$(find "$(dirname $TOUCH_FILE)" -mtime -1 -name "$(basename $TOUCH_FILE)" 2>/dev/null | grep -q "." ;echo $? )
     if [ $FEXISTS -eq 1 -o  $FRECENT -eq 1 -o $FORCE_BACKUP -eq 1 ];
     then
-    	sleep 10
-           	echo "Backing up, as no backup made in last day [$RESTIC_REPOSITORY]"
-    	if ~/bin/restic backup --tag kronos /etc /home  --exclude-file=$HOME/scripts/excludelist ;
+        sleep 10
+        echo "Backing up, as no backup made in last day [$RESTIC_REPOSITORY]"
+        if ~/bin/restic backup --tag kronos /etc /home  --exclude-file=$HOME/scripts/excludelist ;
     	then
     		echo "Backup succeeeded [$RESTIC_REPOSITORY]"
     		touch "$TOUCH_FILE"
@@ -72,6 +74,7 @@ This script takes as an arguemnt the previous file (defining the repository para
 It only runs the backup if the relevent file is older than 1 day. That could be adjusted to another period of time, if desired. Alternatively, if OVERRIDE_TIMESTAMP_CHK is 1, then it runs the backup.
 
 ~/scripts/forget.sh
+    
     #!/bin/sh
     
     #Must pass as argument the env file
@@ -84,7 +87,7 @@ It only runs the backup if the relevent file is older than 1 day. That could be
     if restic forget -y 100 -m 12 -w 5 -d 7 ; then
     	echo "Forgotten; what was I doing again? [$RESTIC_REPOSITORY]"
     else
-           	echo "Problem forgetting [$RESTIC_REPOSITORY]"
+        echo "Problem forgetting [$RESTIC_REPOSITORY]"
     	exit 1
     fi
 This removes old snapshots, such that we keep 7 daily, 5 weekly, 12 monthly, and 100 yearly snapshopts. Howevery, no information is removed from the repository, a *prune* command is required for that (periodically), and I haven't automated that.
@@ -95,6 +98,7 @@ Those are the scripts necessary to run backups. I'm sure they could be made bett
 I also am using *systemd* to run them.
 
 ~/.config/systemd/user/backup-S3.timer
+    
     [Unit]
     Description=Backup using restic on a timer
     Wants=network-online.target
@@ -108,21 +112,22 @@ I also am using *systemd* to run them.
     WantedBy=timers.target
 
 ~/.config/systemd/user/backup-S3.service
-   [Unit]
-   Description=restic backup to S3
-   After=systemd-networkd-wait-online.service
-   Wants=systemd-networkd-wait-online.service
-
-   [Service]
-   Type=simple
-   Nice=10
-   Restart=on-failure
-   RestartSec=60
-   Environment="HOME=%h"
-   ExecStart=%h/scripts/backup.sh %h/scripts/restic-env-S3.sh
-
-   [Install]
-   WantedBy=default.target
+
+    [Unit]
+    Description=restic backup to S3
+    After=systemd-networkd-wait-online.service
+    Wants=systemd-networkd-wait-online.service
+
+    [Service]
+    Type=simple
+    Nice=10
+    Restart=on-failure
+    RestartSec=60
+    Environment="HOME=%h"
+    ExecStart=%h/scripts/backup.sh %h/scripts/restic-env-S3.sh
+
+    [Install]
+    WantedBy=default.target
 
 These systemd user service and timer files work for me. But, I would say this was the hardest part of all of this. Specifically, this service will run on startup if the computer was off (or asleep, etc) when it was scheduled. But, it will run before the network is properly connected, and so fail. That is what the After, Wants lines are meant for. But, they don't work properly (or I don't understand what they mean exactly). Hence I added the *Restart=on-failure*, so it will retry 60s later in that case. I assume there is a better way to do this.
 
@@ -133,15 +138,18 @@ and removed the After, Wants lines, in backup-HDD.service (and corresponding bac
 
 
 The timer and service are enabled with
+
 	systemctl --user daemon-reload
 	systemctl --user enable backup-S3.service
 	systemctl --user start backup-S3.timer
 
 I am actually running these as a user *restic*, so I have also run
+
 	sudo loginctl enable-linger restic
 (note: I access a shell for user restic with *sudo -u restic bash*, but also need to run *export XDG_RUNTIME_DIR=/run/user/1002*, where 1002 is the UID of restic, to be able to run the systemctl command)
 
 I installed a copy of restic for the user restic, and on the binary ran
+
 	sudo setcap cap_dac_read_search=+ep ~restic/bin/restic
 so that it would have access to all files. This way, I can avoid running as root, yet still back up all files.
 

diff --git a/posts/Backup_solution.mdwn b/posts/Backup_solution.mdwn
new file mode 100644
index 0000000..56db223
--- /dev/null
+++ b/posts/Backup_solution.mdwn
@@ -0,0 +1,157 @@
+#Backup solution
+
+My previous backup strategy was to copy most of my home directory when someone I know had computer problems. This clearly isn't a *good* solution, but it mostly comes down to it being too much effort, and I'm too lazy.
+
+## Requirements
+
+Hence, I decided to implement a system that would be automatic (without regular input from me). This means it should actually happen! My criteria look something like
+
+* Scriptable (so I don't need to run it manually)
+* Incremental (so it doesnt need to re-transfer all data each time)
+* Off-site (as one of the main failure modes I'm concerned about is an earthquake destroying my house...
+* Regarding off-site, preferably not needing shell access
+* Encrypted (see off-site)
+* Open source
+
+The software I settled on was [[restic|https://restic.org]]. While there are lots of other options out there (eg bup, bacula, borg, duplicity, rsync, rclone, rdiff-backup), I liked restic's support for Amazon S3 (for which I already had an account, other cloud providers are available), and relative ease to configure. However, I didn't try any of the other options, I'm sure most of them are good too. See <https://wiki.archlinux.org/index.php/Synchronization_and_backup_programs> for a good collection.
+
+I want this to just run in the background, so I am using *systemd* timers to run things automatically. My plan was to run a backup every day, so a daily timer seems to be a good idea. However, I found that often the task would fail (due to lack of a network connection), and so miss the daily backup. Hence I have gone to a half-hourly script, that checks when a backup as last run. This should ensure that backups are run sufficiently often.
+
+## Scripts
+
+Here are the contents of a few files
+
+~/scripts/restic-env-S3.sh
+    #!/bin/sh
+    
+    export RESTIC_REPOSITORY="s3:https://s3.amazonaws.com/MY_BUCKET_NAME"
+    export AWS_ACCESS_KEY_ID="MY_AWS_KEY_ID"
+    export AWS_SECRET_ACCESS_KEY="MY_AWS_ACCESS_KEY"
+    export RESTIC_PASSWORD="MY_RESTIC_PASSWORD"
+This file defines parameters needed to access the repository. Obviously, if not using Amazon S3, the RESTIC_REPOSITORY format will be different. I have one of these files for S3, and one for my USB HDD.
+
+~/scripts/backup.sh
+    #!/bin/sh
+    
+    #Must pass as argument the env file
+    . $1
+    if [ "x$RESTIC_REPOSITORY" = "x" ]; then
+        	echo "RESTIC_REPOSITORY must be set"
+        	exit 1
+    fi
+    FORCE_BACKUP=0
+    if [ "x$OVERRIDE_TIMESTAMP_CHK" = "x1" ]; then
+        echo "Forcing backup [$RESTIC_REPOSITORY]"
+        FORCE_BACKUP=1
+    fi
+    
+    TOUCH_FILE="$HOME/backup_touches/$(echo $RESTIC_REPOSITORY | sha512sum -|cut -f1 -d' ')" 
+    
+    
+    FEXISTS=$(test -f $TOUCH_FILE;echo $?  )
+    FRECENT=$(find "$(dirname $TOUCH_FILE)" -mtime -1 -name "$(basename $TOUCH_FILE)" 2>/dev/null | grep -q "." ;echo $? )
+    if [ $FEXISTS -eq 1 -o  $FRECENT -eq 1 -o $FORCE_BACKUP -eq 1 ];
+    then
+    	sleep 10
+           	echo "Backing up, as no backup made in last day [$RESTIC_REPOSITORY]"
+    	if ~/bin/restic backup --tag kronos /etc /home  --exclude-file=$HOME/scripts/excludelist ;
+    	then
+    		echo "Backup succeeeded [$RESTIC_REPOSITORY]"
+    		touch "$TOUCH_FILE"
+    		./forget.sh
+    	else
+    		echo "Problem with backup [$RESTIC_REPOSITORY]"
+    		exit 2
+    	fi
+    	exit 0
+    else
+    	echo "Not backing up, as there is a recent backup [$RESTIC_REPOSITORY]"
+    fi
+     
+This script takes as an arguemnt the previous file (defining the repository parameters), and actually runs the backup. 
+It only runs the backup if the relevent file is older than 1 day. That could be adjusted to another period of time, if desired. Alternatively, if OVERRIDE_TIMESTAMP_CHK is 1, then it runs the backup.
+
+~/scripts/forget.sh
+    #!/bin/sh
+    
+    #Must pass as argument the env file
+    . $1
+    if [ "x$RESTIC_REPOSITORY" = "x" ]; then
+    	echo "RESTIC_REPOSITORY must be set"
+    	exit 1
+    fi
+    echo "Starting to forget [$RESTIC_REPOSITORY]"
+    if restic forget -y 100 -m 12 -w 5 -d 7 ; then
+    	echo "Forgotten; what was I doing again? [$RESTIC_REPOSITORY]"
+    else
+           	echo "Problem forgetting [$RESTIC_REPOSITORY]"
+    	exit 1
+    fi
+This removes old snapshots, such that we keep 7 daily, 5 weekly, 12 monthly, and 100 yearly snapshopts. Howevery, no information is removed from the repository, a *prune* command is required for that (periodically), and I haven't automated that.
+
+
+Those are the scripts necessary to run backups. I'm sure they could be made better, but they seem functional enough for now.
+
+I also am using *systemd* to run them.
+
+~/.config/systemd/user/backup-S3.timer
+    [Unit]
+    Description=Backup using restic on a timer
+    Wants=network-online.target
+    After=network.target network-online.target
+    
+    [Timer]
+    OnCalendar=*:0/30:00
+    Persistent=true
+    
+    [Install]
+    WantedBy=timers.target
+
+~/.config/systemd/user/backup-S3.service
+   [Unit]
+   Description=restic backup to S3
+   After=systemd-networkd-wait-online.service
+   Wants=systemd-networkd-wait-online.service
+
+   [Service]
+   Type=simple
+   Nice=10
+   Restart=on-failure
+   RestartSec=60
+   Environment="HOME=%h"
+   ExecStart=%h/scripts/backup.sh %h/scripts/restic-env-S3.sh
+
+   [Install]
+   WantedBy=default.target
+
+These systemd user service and timer files work for me. But, I would say this was the hardest part of all of this. Specifically, this service will run on startup if the computer was off (or asleep, etc) when it was scheduled. But, it will run before the network is properly connected, and so fail. That is what the After, Wants lines are meant for. But, they don't work properly (or I don't understand what they mean exactly). Hence I added the *Restart=on-failure*, so it will retry 60s later in that case. I assume there is a better way to do this.
+
+For backing up to USB HDD, I have replaced the last block with
+    [Install]
+    WantedBy=dev-disk-by\x2duuid-MY_UUID.device
+and removed the After, Wants lines, in backup-HDD.service (and corresponding backup-HDD.timer). Thus, it runs the script every 30 minutes, and whenever the device is connected (which is preferable for an external drive).
+
+
+The timer and service are enabled with
+	systemctl --user daemon-reload
+	systemctl --user enable backup-S3.service
+	systemctl --user start backup-S3.timer
+
+I am actually running these as a user *restic*, so I have also run
+	sudo loginctl enable-linger restic
+(note: I access a shell for user restic with *sudo -u restic bash*, but also need to run *export XDG_RUNTIME_DIR=/run/user/1002*, where 1002 is the UID of restic, to be able to run the systemctl command)
+
+I installed a copy of restic for the user restic, and on the binary ran
+	sudo setcap cap_dac_read_search=+ep ~restic/bin/restic
+so that it would have access to all files. This way, I can avoid running as root, yet still back up all files.
+
+## Resources
+
+Some sites I found helpful in doing this:
+
+* https://www.digitalocean.com/community/tutorials/how-to-back-up-data-to-an-object-storage-service-with-the-restic-backup-client
+* https://jpmens.net/2017/08/22/my-backup-software-of-choice-restic/
+* https://blog.filippo.io/restic-cryptography/
+* https://restic.org
+* https://restic.readthedocs.io/en/latest/080_examples.html
+[[!tag tech]]

diff --git a/running/index.mdwn b/running/index.mdwn
index 0ae4c3f..a862134 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -71,12 +71,12 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. June 3, 2018, [[Top of the Wolds 10k|https://runbritainrankings.com/results/results.aspx?meetingid=242395]], 37m48s, 4th, [[!strava 1613892733]]
 22. June 17, 2018, [[Burton Pidsea 10k|https://runbritainrankings.com/results/results.aspx?meetingid=243356]], 36m13s, 3rd, [[!strava 1644026275]]
 22. June 26, 2017, [[Coniston 10k (East Hull Harriers Summer League)|https://runbritainrankings.com/results/results.aspx?meetingid=236200]], 35m20s, 4th, [[!strava 1663992266]] PB
-22. July 10, 2018 Baltrumlauf (5.35km, no results), 19m19s, [[!strava 1693494551]]
+22. July 10, 2018 Baltrumlauf (5.35km, no results), 19m19s, 1st, [[!strava 1693494551]]
 22. August 19, 2018, [[Five Bridges Half Marathon|http://capitalmultisports.co.nz/application/files/6415/3664/7938/Final_results_8_2018.pdf]], 1h19m56s, 1st, [[!strava 1781553788]] PB
-22. September 16, 2018, [[Berlin Marathon|http://results.scc-events.com/2018/?content=detail&event=MAL&idp=99999905C9AF60000044CF4A&pid=search&search[name]=somerville&search[firstname]=walter&id=99999905C9AF60000044CF4A]], 2h49m55s, [[!strava 1845063595]]
-22. October 21, 2018 [[!Honest 10|http://whac.org.nz/wp/honest-10/results/]], 38m14s, [[!strava 1917157693]]
-22. November 18, 2018, [[Honest 10| http://whac.org.nz/wp/honest-10/results-2/#Results_for_Summer_Series_Race_One_18_November_2018]], 37m27s, [[!strava 1970490725]]
-22. January 26, 2019, [[Jumbo-Holdsworth Trail Race|http://jumbo-holdsworth.co.nz/content/results/2019-All-Final-Results_JHTR_26-01-2019.pdf]], 2h56m56s, [[!strava 2103317577]] PB
+22. September 16, 2018, [[Berlin Marathon|http://results.scc-events.com/2018/?content=detail&event=MAL&idp=99999905C9AF60000044CF4A]], 2h49m55s, 709th, [[!strava 1845063595]]
+22. October 21, 2018 [[Honest 10|http://whac.org.nz/wp/honest-10/results/]], 38m14s, 2nd, [[!strava 1917157693]]
+22. November 18, 2018, [[Honest 10|http://whac.org.nz/wp/honest-10/results-2/#Results_for_Summer_Series_Race_One_18_November_2018]], 37m27s, 1st, [[!strava 1970490725]]
+22. January 26, 2019, [[Jumbo-Holdsworth Trail Race|http://jumbo-holdsworth.co.nz/content/results/2019-All-Final-Results_JHTR_26-01-2019.pdf]], 2h56m56s, 12th, [[!strava 2103317577]] PB
 22. February 17, 2019, Round the Bays
 22. March 9, 2019, Tararua Mountain Race
 22. July 13, 2019, WUU2K (43km)

diff --git a/running/index.mdwn b/running/index.mdwn
index 74e5661..0ae4c3f 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -71,8 +71,15 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. June 3, 2018, [[Top of the Wolds 10k|https://runbritainrankings.com/results/results.aspx?meetingid=242395]], 37m48s, 4th, [[!strava 1613892733]]
 22. June 17, 2018, [[Burton Pidsea 10k|https://runbritainrankings.com/results/results.aspx?meetingid=243356]], 36m13s, 3rd, [[!strava 1644026275]]
 22. June 26, 2017, [[Coniston 10k (East Hull Harriers Summer League)|https://runbritainrankings.com/results/results.aspx?meetingid=236200]], 35m20s, 4th, [[!strava 1663992266]] PB
-22. September 16, 2018, Berlin Marathon
-
+22. July 10, 2018 Baltrumlauf (5.35km, no results), 19m19s, [[!strava 1693494551]]
+22. August 19, 2018, [[Five Bridges Half Marathon|http://capitalmultisports.co.nz/application/files/6415/3664/7938/Final_results_8_2018.pdf]], 1h19m56s, 1st, [[!strava 1781553788]] PB
+22. September 16, 2018, [[Berlin Marathon|http://results.scc-events.com/2018/?content=detail&event=MAL&idp=99999905C9AF60000044CF4A&pid=search&search[name]=somerville&search[firstname]=walter&id=99999905C9AF60000044CF4A]], 2h49m55s, [[!strava 1845063595]]
+22. October 21, 2018 [[!Honest 10|http://whac.org.nz/wp/honest-10/results/]], 38m14s, [[!strava 1917157693]]
+22. November 18, 2018, [[Honest 10| http://whac.org.nz/wp/honest-10/results-2/#Results_for_Summer_Series_Race_One_18_November_2018]], 37m27s, [[!strava 1970490725]]
+22. January 26, 2019, [[Jumbo-Holdsworth Trail Race|http://jumbo-holdsworth.co.nz/content/results/2019-All-Final-Results_JHTR_26-01-2019.pdf]], 2h56m56s, [[!strava 2103317577]] PB
+22. February 17, 2019, Round the Bays
+22. March 9, 2019, Tararua Mountain Race
+22. July 13, 2019, WUU2K (43km)
 
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].
 
@@ -84,7 +91,7 @@ parkrun | 16m56s | Hull parkrun
 5k | 17m28s | Doncaster Town Centre 5k, 2016
 10k | 35m20s | Coniston 10k, 2018
 10m | 59m55s | Gilberdye 10, 2017
-1/2 Marathon | 1h21m35s | Canal Canter Summer Extravaganza, 2017
+1/2 Marathon | 1h19m56s | Five Bridges Half Marathon, 2018
 20m | 2h10m21s | East Hull 20, 2018
 Marathon | 2h48m16s | Loch Ness Marathon, 2017
 """]]

diff --git a/running/index.mdwn b/running/index.mdwn
index 5c0b3a4..74e5661 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -69,8 +69,8 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. May 20, 2018, [[Ravenscar Half Marathon|http://www.srmrt.org.uk/wp-content/uploads/2018/05/Ravenscar-HM-2018.pdf]], 1h30m26s, 1st, [[!strava 1583806225]]
 22. May 27, 2018, Wolds Way Relay, 2nd team overall and 1st mixed in 10h55m, I ran 2nd leg in 58m27s, [[!strava 1598678387]]
 22. June 3, 2018, [[Top of the Wolds 10k|https://runbritainrankings.com/results/results.aspx?meetingid=242395]], 37m48s, 4th, [[!strava 1613892733]]
-22. June 17, 2018, Burton Pidsea 10k
-22. June 26, 2017, Coniston 10k (East Hull Harriers Summer League)
+22. June 17, 2018, [[Burton Pidsea 10k|https://runbritainrankings.com/results/results.aspx?meetingid=243356]], 36m13s, 3rd, [[!strava 1644026275]]
+22. June 26, 2017, [[Coniston 10k (East Hull Harriers Summer League)|https://runbritainrankings.com/results/results.aspx?meetingid=236200]], 35m20s, 4th, [[!strava 1663992266]] PB
 22. September 16, 2018, Berlin Marathon
 
 
@@ -82,7 +82,7 @@ I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/result
 Distance | Time | Race
 parkrun | 16m56s | Hull parkrun
 5k | 17m28s | Doncaster Town Centre 5k, 2016
-10k | 35m51s | Beverley 10k, 2018
+10k | 35m20s | Coniston 10k, 2018
 10m | 59m55s | Gilberdye 10, 2017
 1/2 Marathon | 1h21m35s | Canal Canter Summer Extravaganza, 2017
 20m | 2h10m21s | East Hull 20, 2018

diff --git a/running/index.mdwn b/running/index.mdwn
index a8cbe3b..5c0b3a4 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -67,8 +67,10 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. March 30, 2018 [[Good Friday Hill Race "7 Miles with 7 Hills"|http://easthullharriers.com/wp-content/uploads/2018/03/EHH-Winter-League-6-Brantingham-7-Mile.pdf]], 52m07s, 3rd, [[!strava 1479416565]]
 22. May 13, 2018, [[Beverley 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=240&bib=133]], 35m51s, 17th, [[!strava 1569226471]] PB
 22. May 20, 2018, [[Ravenscar Half Marathon|http://www.srmrt.org.uk/wp-content/uploads/2018/05/Ravenscar-HM-2018.pdf]], 1h30m26s, 1st, [[!strava 1583806225]]
-22. May 27, 2018, Wolds Way Relay
-22. June 3, 2018, Top of the Wolds 10k
+22. May 27, 2018, Wolds Way Relay, 2nd team overall and 1st mixed in 10h55m, I ran 2nd leg in 58m27s, [[!strava 1598678387]]
+22. June 3, 2018, [[Top of the Wolds 10k|https://runbritainrankings.com/results/results.aspx?meetingid=242395]], 37m48s, 4th, [[!strava 1613892733]]
+22. June 17, 2018, Burton Pidsea 10k
+22. June 26, 2017, Coniston 10k (East Hull Harriers Summer League)
 22. September 16, 2018, Berlin Marathon
 
 

diff --git a/running/index.mdwn b/running/index.mdwn
index a0f9702..a8cbe3b 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -78,7 +78,7 @@ I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/result
 
 [[!table data="""
 Distance | Time | Race
-parkrun | 17m29s | Dalby Forest parkrun
+parkrun | 16m56s | Hull parkrun
 5k | 17m28s | Doncaster Town Centre 5k, 2016
 10k | 35m51s | Beverley 10k, 2018
 10m | 59m55s | Gilberdye 10, 2017

diff --git a/running/index.mdwn b/running/index.mdwn
index 114f40e..a0f9702 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -52,7 +52,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 20. June 25, 2017, [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=189&bib=99]], 1h22m03s, 17th overall, [[!strava 1053049202]],PB
 20. July 8, 2017, [[Summer Extravaganza Half Marathon|https://racebest.com/results/canal-canter-summer-extravaganza]], 1h21m35s, 1st, [[!strava 1073084603]] PB
 20. July 12, 2017, [[Doncaster Town Centre 5k|http://sportstimingsolutions.co.uk/rcd.php?id=197&bib=308]], 17m28s, 54th overall, [[!strava 1080394107]]
-20. 14 July, 2017, [[Walkington 10k|http://sportstimingsolutions.co.uk/rcd.php?id=199&bib=135]], 37m04s, 10th overall, [[!strava 1083430598]] Course PB
+20. July 14, 2017, [[Walkington 10k|http://sportstimingsolutions.co.uk/rcd.php?id=199&bib=135]], 37m04s, 10th overall, [[!strava 1083430598]] Course PB
 21. July 30, 2017, [[Grimsby 10k|http://www.stuweb.co.uk/race/1uV/2522.html]]  36m37s, 29th overall, [[!strava 1108422562]]
 21. August 27, 2017, [[Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m55s, 8th overall, [[!strava 1154617931]] PB
 21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall, [[!strava 1199273481]] PB
@@ -66,7 +66,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. March 25, 2018 [[East Hull 20|http://www.sportstimingsolutions.co.uk/rcd.php?id=228&bib=627]], 2h10m21s, 25th, [[!strava 1470759745]] PB
 22. March 30, 2018 [[Good Friday Hill Race "7 Miles with 7 Hills"|http://easthullharriers.com/wp-content/uploads/2018/03/EHH-Winter-League-6-Brantingham-7-Mile.pdf]], 52m07s, 3rd, [[!strava 1479416565]]
 22. May 13, 2018, [[Beverley 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=240&bib=133]], 35m51s, 17th, [[!strava 1569226471]] PB
-22. May 20, 2018, Ravenscar Half Marathon
+22. May 20, 2018, [[Ravenscar Half Marathon|http://www.srmrt.org.uk/wp-content/uploads/2018/05/Ravenscar-HM-2018.pdf]], 1h30m26s, 1st, [[!strava 1583806225]]
 22. May 27, 2018, Wolds Way Relay
 22. June 3, 2018, Top of the Wolds 10k
 22. September 16, 2018, Berlin Marathon

diff --git a/running/index.mdwn b/running/index.mdwn
index 5bc50ec..114f40e 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -65,7 +65,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. February 4, 2018, [[Dewsbury 10k|https://www.tdleventservices.co.uk/event-results/individual?event=2807&racenumber=8]], 37m10s, 101st, [[!strava 1390729842]]
 22. March 25, 2018 [[East Hull 20|http://www.sportstimingsolutions.co.uk/rcd.php?id=228&bib=627]], 2h10m21s, 25th, [[!strava 1470759745]] PB
 22. March 30, 2018 [[Good Friday Hill Race "7 Miles with 7 Hills"|http://easthullharriers.com/wp-content/uploads/2018/03/EHH-Winter-League-6-Brantingham-7-Mile.pdf]], 52m07s, 3rd, [[!strava 1479416565]]
-22. May 13, 2018, Beverley 10k
+22. May 13, 2018, [[Beverley 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=240&bib=133]], 35m51s, 17th, [[!strava 1569226471]] PB
 22. May 20, 2018, Ravenscar Half Marathon
 22. May 27, 2018, Wolds Way Relay
 22. June 3, 2018, Top of the Wolds 10k
@@ -80,7 +80,7 @@ I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/result
 Distance | Time | Race
 parkrun | 17m29s | Dalby Forest parkrun
 5k | 17m28s | Doncaster Town Centre 5k, 2016
-10k | 36m12s | Dewsbury 10k, 2017 (long course)
+10k | 35m51s | Beverley 10k, 2018
 10m | 59m55s | Gilberdye 10, 2017
 1/2 Marathon | 1h21m35s | Canal Canter Summer Extravaganza, 2017
 20m | 2h10m21s | East Hull 20, 2018

diff --git a/running/index.mdwn b/running/index.mdwn
index 38798fc..5bc50ec 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -68,6 +68,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. May 13, 2018, Beverley 10k
 22. May 20, 2018, Ravenscar Half Marathon
 22. May 27, 2018, Wolds Way Relay
+22. June 3, 2018, Top of the Wolds 10k
 22. September 16, 2018, Berlin Marathon
 
 

diff --git a/running/index.mdwn b/running/index.mdwn
index 27f2f5a..38798fc 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -59,8 +59,17 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 21. October 14, 2017, [[Gruesome Twosome Half Marathon|https://tape2tape.co.uk/wp-content/uploads/2016/06/Gruesome-Twosome-Half-2017-Results.xlsx]] with Mike Potter, 1h40m33s, 17th pair, [[!strava 1229547312]]
 21. October 29, 2017, [[Haltemprice 10k|http://www.cityofhullac.co.uk/userfiles/files/Haltemprice%2010k/Haltemprice-10k-2017-Results%20(1).xls]], 36m22s, 5th, [[!strava 1252179808]], Course PB
 22. November 11, 2017, [[Hardmoors 26.2 Goathland Trail Marathon|https://www.hardmoors110.org.uk/hardmoors-26-2-goathland-trail-marathon/]], 3h43m00s, 1st(!), [[!strava 1270567865]]
-22. December 10, 2017, Tinsel Turbary Trail Race
-22. December 31, 2017, Silvesterlauf
+22. December 10, 2017, [[Tinsel Turbary Trail Race|http://docdro.id/6HTXzh3]], 47m45s, 1st, [[!strava 1309085523]]
+22. December 31, 2017, [[Silvesterlauf|https://www.berliner-silvesterlauf.de/der-tag/ergebnisliste.html]], 38m14s, 12th, [[!strava 1334567461]] PB
+22. January 28, 2018, [[Ferriby 10|http://www.sportstimingsolutions.co.uk/rcd.php?id=224&bib=10]], 63m11s, 38th, [[!strava 1379343992]]
+22. February 4, 2018, [[Dewsbury 10k|https://www.tdleventservices.co.uk/event-results/individual?event=2807&racenumber=8]], 37m10s, 101st, [[!strava 1390729842]]
+22. March 25, 2018 [[East Hull 20|http://www.sportstimingsolutions.co.uk/rcd.php?id=228&bib=627]], 2h10m21s, 25th, [[!strava 1470759745]] PB
+22. March 30, 2018 [[Good Friday Hill Race "7 Miles with 7 Hills"|http://easthullharriers.com/wp-content/uploads/2018/03/EHH-Winter-League-6-Brantingham-7-Mile.pdf]], 52m07s, 3rd, [[!strava 1479416565]]
+22. May 13, 2018, Beverley 10k
+22. May 20, 2018, Ravenscar Half Marathon
+22. May 27, 2018, Wolds Way Relay
+22. September 16, 2018, Berlin Marathon
+
 
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].
 
@@ -73,6 +82,6 @@ parkrun | 17m29s | Dalby Forest parkrun
 10k | 36m12s | Dewsbury 10k, 2017 (long course)
 10m | 59m55s | Gilberdye 10, 2017
 1/2 Marathon | 1h21m35s | Canal Canter Summer Extravaganza, 2017
-20m | 2h15m00s | East Hull 20, 2017
+20m | 2h10m21s | East Hull 20, 2018
 Marathon | 2h48m16s | Loch Ness Marathon, 2017
 """]]

diff --git a/running/index.mdwn b/running/index.mdwn
index 4f3b6d2..27f2f5a 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -58,7 +58,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall, [[!strava 1199273481]] PB
 21. October 14, 2017, [[Gruesome Twosome Half Marathon|https://tape2tape.co.uk/wp-content/uploads/2016/06/Gruesome-Twosome-Half-2017-Results.xlsx]] with Mike Potter, 1h40m33s, 17th pair, [[!strava 1229547312]]
 21. October 29, 2017, [[Haltemprice 10k|http://www.cityofhullac.co.uk/userfiles/files/Haltemprice%2010k/Haltemprice-10k-2017-Results%20(1).xls]], 36m22s, 5th, [[!strava 1252179808]], Course PB
-22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon, 3h43m??s, 1st(!), [[!strava 1270567865]]
+22. November 11, 2017, [[Hardmoors 26.2 Goathland Trail Marathon|https://www.hardmoors110.org.uk/hardmoors-26-2-goathland-trail-marathon/]], 3h43m00s, 1st(!), [[!strava 1270567865]]
 22. December 10, 2017, Tinsel Turbary Trail Race
 22. December 31, 2017, Silvesterlauf
 

diff --git a/running/index.mdwn b/running/index.mdwn
index 145cad6..4f3b6d2 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -58,7 +58,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall, [[!strava 1199273481]] PB
 21. October 14, 2017, [[Gruesome Twosome Half Marathon|https://tape2tape.co.uk/wp-content/uploads/2016/06/Gruesome-Twosome-Half-2017-Results.xlsx]] with Mike Potter, 1h40m33s, 17th pair, [[!strava 1229547312]]
 21. October 29, 2017, [[Haltemprice 10k|http://www.cityofhullac.co.uk/userfiles/files/Haltemprice%2010k/Haltemprice-10k-2017-Results%20(1).xls]], 36m22s, 5th, [[!strava 1252179808]], Course PB
-22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon
+22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon, 3h43m??s, 1st(!), [[!strava 1270567865]]
 22. December 10, 2017, Tinsel Turbary Trail Race
 22. December 31, 2017, Silvesterlauf
 

diff --git a/running/index.mdwn b/running/index.mdwn
index 135fc25..145cad6 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -57,7 +57,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 21. August 27, 2017, [[Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m55s, 8th overall, [[!strava 1154617931]] PB
 21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall, [[!strava 1199273481]] PB
 21. October 14, 2017, [[Gruesome Twosome Half Marathon|https://tape2tape.co.uk/wp-content/uploads/2016/06/Gruesome-Twosome-Half-2017-Results.xlsx]] with Mike Potter, 1h40m33s, 17th pair, [[!strava 1229547312]]
-21. October 29, 2017, [[Haltemprice 10k|http://www.cityofhullac.co.uk/userfiles/files/Haltemprice%2010k/Haltemprice-10k-2017-Results%20(1).xls]], 36m22s, 5th, [[!strava 1252179808]]
+21. October 29, 2017, [[Haltemprice 10k|http://www.cityofhullac.co.uk/userfiles/files/Haltemprice%2010k/Haltemprice-10k-2017-Results%20(1).xls]], 36m22s, 5th, [[!strava 1252179808]], Course PB
 22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon
 22. December 10, 2017, Tinsel Turbary Trail Race
 22. December 31, 2017, Silvesterlauf

diff --git a/running/index.mdwn b/running/index.mdwn
index 7f871c0..135fc25 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -57,7 +57,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 21. August 27, 2017, [[Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m55s, 8th overall, [[!strava 1154617931]] PB
 21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall, [[!strava 1199273481]] PB
 21. October 14, 2017, [[Gruesome Twosome Half Marathon|https://tape2tape.co.uk/wp-content/uploads/2016/06/Gruesome-Twosome-Half-2017-Results.xlsx]] with Mike Potter, 1h40m33s, 17th pair, [[!strava 1229547312]]
-21. October 29, 2017, Haltemprice 10k
+21. October 29, 2017, [[Haltemprice 10k|http://www.cityofhullac.co.uk/userfiles/files/Haltemprice%2010k/Haltemprice-10k-2017-Results%20(1).xls]], 36m22s, 5th, [[!strava 1252179808]]
 22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon
 22. December 10, 2017, Tinsel Turbary Trail Race
 22. December 31, 2017, Silvesterlauf

diff --git a/running/index.mdwn b/running/index.mdwn
index 5501ac9..7f871c0 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -61,6 +61,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon
 22. December 10, 2017, Tinsel Turbary Trail Race
 22. December 31, 2017, Silvesterlauf
+
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].
 
 ## PBs

diff --git a/running/index.mdwn b/running/index.mdwn
index ed47f65..5501ac9 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -56,11 +56,11 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 21. July 30, 2017, [[Grimsby 10k|http://www.stuweb.co.uk/race/1uV/2522.html]]  36m37s, 29th overall, [[!strava 1108422562]]
 21. August 27, 2017, [[Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m55s, 8th overall, [[!strava 1154617931]] PB
 21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall, [[!strava 1199273481]] PB
-21. October 14, 2017, Gruesome Twosome Half Marathon with Mike Potter
+21. October 14, 2017, [[Gruesome Twosome Half Marathon|https://tape2tape.co.uk/wp-content/uploads/2016/06/Gruesome-Twosome-Half-2017-Results.xlsx]] with Mike Potter, 1h40m33s, 17th pair, [[!strava 1229547312]]
 21. October 29, 2017, Haltemprice 10k
 22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon
 22. December 10, 2017, Tinsel Turbary Trail Race
-
+22. December 31, 2017, Silvesterlauf
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].
 
 ## PBs

diff --git a/running/index.mdwn b/running/index.mdwn
index e29de73..ed47f65 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -48,7 +48,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 19. (Didn't run; injured. I marshalled instead) April 1, 2017, Temple Newsam Trail Marathon
 19. May 7, 2017, [[North Lincolnshire Half Marathon|http://www.stuweb.co.uk/race/1w4/1293.html]], 1h22m04s, 41st overall [[!strava 974707741]] (still recovering from injury so not going full effort) PB
 19. (Didn't run, back in NZ) May 14, 2017, Beverley 10k
-19. May 28, 2017, [[Humber Bridge 10k|http://www.time2runevents.co.uk/info2.cfm?info_id=224863]], 38m14s, 9th overall (1st non-PB 10k race :( ) [[!strava 1009298804]]
+19. May 28, 2017, [[Humber Bridge 10k|https://www.dotgo.uk/shared/images/content/bus_53019/pdf/Humber_Bridge_10k_2017_Reults.pdf]], 38m14s, 9th overall (1st non-PB 10k race :( ) [[!strava 1009298804]]
 20. June 25, 2017, [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=189&bib=99]], 1h22m03s, 17th overall, [[!strava 1053049202]],PB
 20. July 8, 2017, [[Summer Extravaganza Half Marathon|https://racebest.com/results/canal-canter-summer-extravaganza]], 1h21m35s, 1st, [[!strava 1073084603]] PB
 20. July 12, 2017, [[Doncaster Town Centre 5k|http://sportstimingsolutions.co.uk/rcd.php?id=197&bib=308]], 17m28s, 54th overall, [[!strava 1080394107]]

diff --git a/running/index.mdwn b/running/index.mdwn
index 0c83e47..e29de73 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -49,7 +49,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 19. May 7, 2017, [[North Lincolnshire Half Marathon|http://www.stuweb.co.uk/race/1w4/1293.html]], 1h22m04s, 41st overall [[!strava 974707741]] (still recovering from injury so not going full effort) PB
 19. (Didn't run, back in NZ) May 14, 2017, Beverley 10k
 19. May 28, 2017, [[Humber Bridge 10k|http://www.time2runevents.co.uk/info2.cfm?info_id=224863]], 38m14s, 9th overall (1st non-PB 10k race :( ) [[!strava 1009298804]]
-20. June 25, 2017, [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=189&bib=99]], 1h22m05s, 17th overall, [[!strava 1053049202]], Course PB
+20. June 25, 2017, [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=189&bib=99]], 1h22m03s, 17th overall, [[!strava 1053049202]],PB
 20. July 8, 2017, [[Summer Extravaganza Half Marathon|https://racebest.com/results/canal-canter-summer-extravaganza]], 1h21m35s, 1st, [[!strava 1073084603]] PB
 20. July 12, 2017, [[Doncaster Town Centre 5k|http://sportstimingsolutions.co.uk/rcd.php?id=197&bib=308]], 17m28s, 54th overall, [[!strava 1080394107]]
 20. 14 July, 2017, [[Walkington 10k|http://sportstimingsolutions.co.uk/rcd.php?id=199&bib=135]], 37m04s, 10th overall, [[!strava 1083430598]] Course PB

diff --git a/running/index.mdwn b/running/index.mdwn
index 068c2d4..0c83e47 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -54,7 +54,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 20. July 12, 2017, [[Doncaster Town Centre 5k|http://sportstimingsolutions.co.uk/rcd.php?id=197&bib=308]], 17m28s, 54th overall, [[!strava 1080394107]]
 20. 14 July, 2017, [[Walkington 10k|http://sportstimingsolutions.co.uk/rcd.php?id=199&bib=135]], 37m04s, 10th overall, [[!strava 1083430598]] Course PB
 21. July 30, 2017, [[Grimsby 10k|http://www.stuweb.co.uk/race/1uV/2522.html]]  36m37s, 29th overall, [[!strava 1108422562]]
-21. August 27, 2017, [[Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m56s, 8th overall, [[!strava 1154617931]] PB
+21. August 27, 2017, [[Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m55s, 8th overall, [[!strava 1154617931]] PB
 21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall, [[!strava 1199273481]] PB
 21. October 14, 2017, Gruesome Twosome Half Marathon with Mike Potter
 21. October 29, 2017, Haltemprice 10k
@@ -70,7 +70,7 @@ Distance | Time | Race
 parkrun | 17m29s | Dalby Forest parkrun
 5k | 17m28s | Doncaster Town Centre 5k, 2016
 10k | 36m12s | Dewsbury 10k, 2017 (long course)
-10m | 59m56s | Gilberdye 10, 2017
+10m | 59m55s | Gilberdye 10, 2017
 1/2 Marathon | 1h21m35s | Canal Canter Summer Extravaganza, 2017
 20m | 2h15m00s | East Hull 20, 2017
 Marathon | 2h48m16s | Loch Ness Marathon, 2017

diff --git a/running/index.mdwn b/running/index.mdwn
index 8903dac..068c2d4 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -62,3 +62,16 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 22. December 10, 2017, Tinsel Turbary Trail Race
 
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].
+
+## PBs
+
+[[!table data="""
+Distance | Time | Race
+parkrun | 17m29s | Dalby Forest parkrun
+5k | 17m28s | Doncaster Town Centre 5k, 2016
+10k | 36m12s | Dewsbury 10k, 2017 (long course)
+10m | 59m56s | Gilberdye 10, 2017
+1/2 Marathon | 1h21m35s | Canal Canter Summer Extravaganza, 2017
+20m | 2h15m00s | East Hull 20, 2017
+Marathon | 2h48m16s | Loch Ness Marathon, 2017
+"""]]

diff --git a/running/index.mdwn b/running/index.mdwn
index 9d7ea7c..8903dac 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -50,7 +50,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 19. (Didn't run, back in NZ) May 14, 2017, Beverley 10k
 19. May 28, 2017, [[Humber Bridge 10k|http://www.time2runevents.co.uk/info2.cfm?info_id=224863]], 38m14s, 9th overall (1st non-PB 10k race :( ) [[!strava 1009298804]]
 20. June 25, 2017, [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=189&bib=99]], 1h22m05s, 17th overall, [[!strava 1053049202]], Course PB
-20. July 8, 2017, Summer Extravaganza Half Marathon, 1h21m35s, 1st, [[!strava 1073084603]] PB
+20. July 8, 2017, [[Summer Extravaganza Half Marathon|https://racebest.com/results/canal-canter-summer-extravaganza]], 1h21m35s, 1st, [[!strava 1073084603]] PB
 20. July 12, 2017, [[Doncaster Town Centre 5k|http://sportstimingsolutions.co.uk/rcd.php?id=197&bib=308]], 17m28s, 54th overall, [[!strava 1080394107]]
 20. 14 July, 2017, [[Walkington 10k|http://sportstimingsolutions.co.uk/rcd.php?id=199&bib=135]], 37m04s, 10th overall, [[!strava 1083430598]] Course PB
 21. July 30, 2017, [[Grimsby 10k|http://www.stuweb.co.uk/race/1uV/2522.html]]  36m37s, 29th overall, [[!strava 1108422562]]

diff --git a/running/index.mdwn b/running/index.mdwn
index 892978b..9d7ea7c 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -53,8 +53,8 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 20. July 8, 2017, Summer Extravaganza Half Marathon, 1h21m35s, 1st, [[!strava 1073084603]] PB
 20. July 12, 2017, [[Doncaster Town Centre 5k|http://sportstimingsolutions.co.uk/rcd.php?id=197&bib=308]], 17m28s, 54th overall, [[!strava 1080394107]]
 20. 14 July, 2017, [[Walkington 10k|http://sportstimingsolutions.co.uk/rcd.php?id=199&bib=135]], 37m04s, 10th overall, [[!strava 1083430598]] Course PB
-21. July 30, 2017, [[!Grimsby 10k|http://www.stuweb.co.uk/race/1uV/2522.html]]  36m37s, 29th overall, [[!strava 1108422562]]
-21. August 27, 2017, [[!Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m56s, 8th overall, [[!strava 1154617931]] PB
+21. July 30, 2017, [[Grimsby 10k|http://www.stuweb.co.uk/race/1uV/2522.html]]  36m37s, 29th overall, [[!strava 1108422562]]
+21. August 27, 2017, [[Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m56s, 8th overall, [[!strava 1154617931]] PB
 21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall, [[!strava 1199273481]] PB
 21. October 14, 2017, Gruesome Twosome Half Marathon with Mike Potter
 21. October 29, 2017, Haltemprice 10k

diff --git a/running/index.mdwn b/running/index.mdwn
index 01804e7..892978b 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -40,6 +40,7 @@ So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a fe
 Since the Hull Marathon (beat my target), I'm just running for fun, no particular goals. Some races:
 
 14. October 30, 2016 Haltemprice 10k, 37m03s, 7th overall, [[!strava 760492671]] PB (got a bit lost and missed a turn, so added ~20-30s and lost a place)
+14. December 11, 2016, [[Tinsel Turbary Trail Race 7.5m|https://www.docdroid.net/DvG0Pkf/tinsel-turbary-trail-2016-full-results.pdf.html]] 47m26s, 5th overall, [[!strava 799401319]]
 15. December 31, 2016 [[Silvesterlauf|http://www.berliner-silvesterlauf.de/der-tag-/ergebnisarchiv.html]], 38m16s, 16th overall, [[!strava 816680295]]
 16. January 29, 2017, [[Ferriby 10 Mile|http://www.sportstimingsolutions.co.uk/rcd.php?id=159&bib=19]] 1h00m16s, 23rd overall, [[!strava 848023739]]
 17. February 5, 2017, [[Dewsbury 10k|http://tdleventservices.co.uk/race-results-individual.php?event=2481&competitor_id=735]], 36m12s, 49th overall, [[!strava 855705384]] PB
@@ -50,12 +51,14 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 19. May 28, 2017, [[Humber Bridge 10k|http://www.time2runevents.co.uk/info2.cfm?info_id=224863]], 38m14s, 9th overall (1st non-PB 10k race :( ) [[!strava 1009298804]]
 20. June 25, 2017, [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=189&bib=99]], 1h22m05s, 17th overall, [[!strava 1053049202]], Course PB
 20. July 8, 2017, Summer Extravaganza Half Marathon, 1h21m35s, 1st, [[!strava 1073084603]] PB
-20. July 12, 2017, Doncaster Town Centre 5k
-20. 14 July, 2017, Walkington 10k
-21. July 30, 2017, Grimsby 10k
-21. September 24, 2017, Loch Ness Marathon
+20. July 12, 2017, [[Doncaster Town Centre 5k|http://sportstimingsolutions.co.uk/rcd.php?id=197&bib=308]], 17m28s, 54th overall, [[!strava 1080394107]]
+20. 14 July, 2017, [[Walkington 10k|http://sportstimingsolutions.co.uk/rcd.php?id=199&bib=135]], 37m04s, 10th overall, [[!strava 1083430598]] Course PB
+21. July 30, 2017, [[!Grimsby 10k|http://www.stuweb.co.uk/race/1uV/2522.html]]  36m37s, 29th overall, [[!strava 1108422562]]
+21. August 27, 2017, [[!Gilberdyke 10|http://sportstimingsolutions.co.uk/rcd.php?id=204&bib=9]], 59m56s, 8th overall, [[!strava 1154617931]] PB
+21. September 24, 2017, [[Loch Ness Marathon|http://www.lochnessmarathon.com/results/1/2017/?text-search=2152]], 2h48m16s, 16th overall, [[!strava 1199273481]] PB
 21. October 14, 2017, Gruesome Twosome Half Marathon with Mike Potter
+21. October 29, 2017, Haltemprice 10k
 22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon
-
+22. December 10, 2017, Tinsel Turbary Trail Race
 
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].

diff --git a/running/index.mdwn b/running/index.mdwn
index 6d0abe9..01804e7 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -49,7 +49,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 19. (Didn't run, back in NZ) May 14, 2017, Beverley 10k
 19. May 28, 2017, [[Humber Bridge 10k|http://www.time2runevents.co.uk/info2.cfm?info_id=224863]], 38m14s, 9th overall (1st non-PB 10k race :( ) [[!strava 1009298804]]
 20. June 25, 2017, [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=189&bib=99]], 1h22m05s, 17th overall, [[!strava 1053049202]], Course PB
-20. July 8, 2017, Summer Extravaganza Half Marathon
+20. July 8, 2017, Summer Extravaganza Half Marathon, 1h21m35s, 1st, [[!strava 1073084603]] PB
 20. July 12, 2017, Doncaster Town Centre 5k
 20. 14 July, 2017, Walkington 10k
 21. July 30, 2017, Grimsby 10k

diff --git a/running/index.mdwn b/running/index.mdwn
index ab8b495..6d0abe9 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -3,7 +3,7 @@
 Here are some early races I did:
 
 1. Feb 17, 2013 [[Round the Bays|https://secure.tiktok.biz/results/view/wellingtonroundthebays/2013/20516]] Half Marathon, 1h37m15s, 302nd, first race ever.
-1. March 8, 2013, [[Captial Punishment|http://www.olympicharriers.nz/results/event.php?eid=998]], 45m22s.
+1. March 17, 2013, [[Captial Punishment|http://www.olympicharriers.nz/results/event.php?eid=998]], 45m22s, 13th.
 1. Apr 27, 2013 [[Bush to Beach|http://results.racetiming.co.nz/competitions/595/22km%20Half%20Marathon]] 22km "Half Marathon", 2h02m06s, 21st
 
 Here I plan to list various races that I have done or will do, while training for the [[Tararua_mountain_race|http://www.tmr.org.nz]].

diff --git a/running/index.mdwn b/running/index.mdwn
index 79cd3d0..ab8b495 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -1,5 +1,11 @@
 [[!meta title="Running plan"]]
 
+Here are some early races I did:
+
+1. Feb 17, 2013 [[Round the Bays|https://secure.tiktok.biz/results/view/wellingtonroundthebays/2013/20516]] Half Marathon, 1h37m15s, 302nd, first race ever.
+1. March 8, 2013, [[Captial Punishment|http://www.olympicharriers.nz/results/event.php?eid=998]], 45m22s.
+1. Apr 27, 2013 [[Bush to Beach|http://results.racetiming.co.nz/competitions/595/22km%20Half%20Marathon]] 22km "Half Marathon", 2h02m06s, 21st
+
 Here I plan to list various races that I have done or will do, while training for the [[Tararua_mountain_race|http://www.tmr.org.nz]].
 
 1. Oct 19 2013, [[Wharf_to_wharf|http://www.thebarrier.co.nz/wharf2wharf.htm]], ran half marathon in 1h55m.

diff --git a/running/index.mdwn b/running/index.mdwn
index 63f40d6..79cd3d0 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -4,8 +4,8 @@ Here I plan to list various races that I have done or will do, while training fo
 
 1. Oct 19 2013, [[Wharf_to_wharf|http://www.thebarrier.co.nz/wharf2wharf.htm]], ran half marathon in 1h55m.
 2. Nov 9 2013, [[Rimutaka_rail_trail_run|http://www.trenthamunited.com/archive/2013/results/2013%20Rimutaka%20Rail%20Trail%20results%20v1.3.pdf]], half marathon, run in 1h35m35s. PB
-3. Jan 25, 2014 [[Jumbo-Holdsworth_Trail_Race|http://jumbo-holdsworth.co.nz]], 24 km trail run, 3h17m18s [[!strava 108713131]]
-4. Feb 23, 2014 [[Round_the_bays|http://www.wellingtonroundthebays.co.nz]], 21km, aim for sub-1h30m? I did aim for that, but course was measured long. 1h33m07s. [[!strava 115303364]] PB
+3. Jan 25, 2014 [[Jumbo-Holdsworth_Trail_Race|http://jumbo-holdsworth.co.nz/results-and-photos/2014-results/]], 24 km trail run, 3h17m18s, 33rd [[!strava 108713131]]
+4. Feb 23, 2014 [[Round_the_bays|https://secure.tiktok.biz/results/view/wellingtonroundthebays/2014/30058]], half marathon, aim for sub-1h30m? I did aim for that, but course was measured long. 1h32m57s. [[!strava 115303364]] PB
 5. Mar 8, 2014 [[Tararua_mountain_race|http://www.tmr.org.nz]], The target... not sure. The result - 5h37m36s, 8th overall. [[!strava 118817072]]
 
 

diff --git a/running/index.mdwn b/running/index.mdwn
index 52d2d16..63f40d6 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -42,7 +42,8 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 19. May 7, 2017, [[North Lincolnshire Half Marathon|http://www.stuweb.co.uk/race/1w4/1293.html]], 1h22m04s, 41st overall [[!strava 974707741]] (still recovering from injury so not going full effort) PB
 19. (Didn't run, back in NZ) May 14, 2017, Beverley 10k
 19. May 28, 2017, [[Humber Bridge 10k|http://www.time2runevents.co.uk/info2.cfm?info_id=224863]], 38m14s, 9th overall (1st non-PB 10k race :( ) [[!strava 1009298804]]
-20. June 25, 2017, Humber Bridge Half Marathon
+20. June 25, 2017, [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=189&bib=99]], 1h22m05s, 17th overall, [[!strava 1053049202]], Course PB
+20. July 8, 2017, Summer Extravaganza Half Marathon
 20. July 12, 2017, Doncaster Town Centre 5k
 20. 14 July, 2017, Walkington 10k
 21. July 30, 2017, Grimsby 10k

diff --git a/running/index.mdwn b/running/index.mdwn
index 2003333..52d2d16 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -40,12 +40,14 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 18. March 19, 2017, [[East Hull 20 Mile|http://sportstimingsolutions.co.uk/rcd.php?id=164&bib=616]], 2h15m00s, 44th overall [[!strava 906176218]] (probably shouldn't have run, was injured :(  )
 19. (Didn't run; injured. I marshalled instead) April 1, 2017, Temple Newsam Trail Marathon
 19. May 7, 2017, [[North Lincolnshire Half Marathon|http://www.stuweb.co.uk/race/1w4/1293.html]], 1h22m04s, 41st overall [[!strava 974707741]] (still recovering from injury so not going full effort) PB
-19. May 14, 2017, Beverley 10k
+19. (Didn't run, back in NZ) May 14, 2017, Beverley 10k
+19. May 28, 2017, [[Humber Bridge 10k|http://www.time2runevents.co.uk/info2.cfm?info_id=224863]], 38m14s, 9th overall (1st non-PB 10k race :( ) [[!strava 1009298804]]
 20. June 25, 2017, Humber Bridge Half Marathon
 20. July 12, 2017, Doncaster Town Centre 5k
-20. (Need to enter, date TBC) 14 July, 2017, Walkington 10k
+20. 14 July, 2017, Walkington 10k
 21. July 30, 2017, Grimsby 10k
 21. September 24, 2017, Loch Ness Marathon
+21. October 14, 2017, Gruesome Twosome Half Marathon with Mike Potter
 22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon
 
 

diff --git a/running/index.mdwn b/running/index.mdwn
index a0579f5..2003333 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -39,13 +39,13 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 17. February 5, 2017, [[Dewsbury 10k|http://tdleventservices.co.uk/race-results-individual.php?event=2481&competitor_id=735]], 36m12s, 49th overall, [[!strava 855705384]] PB
 18. March 19, 2017, [[East Hull 20 Mile|http://sportstimingsolutions.co.uk/rcd.php?id=164&bib=616]], 2h15m00s, 44th overall [[!strava 906176218]] (probably shouldn't have run, was injured :(  )
 19. (Didn't run; injured. I marshalled instead) April 1, 2017, Temple Newsam Trail Marathon
-19. May 7, 2017, North Lincolnshire Half Marathon
+19. May 7, 2017, [[North Lincolnshire Half Marathon|http://www.stuweb.co.uk/race/1w4/1293.html]], 1h22m04s, 41st overall [[!strava 974707741]] (still recovering from injury so not going full effort) PB
 19. May 14, 2017, Beverley 10k
 20. June 25, 2017, Humber Bridge Half Marathon
 20. July 12, 2017, Doncaster Town Centre 5k
 20. (Need to enter, date TBC) 14 July, 2017, Walkington 10k
 21. July 30, 2017, Grimsby 10k
-21. (Maybe) September 24, 2017, Hull Marathon (or Loch Ness Marathon?)
+21. September 24, 2017, Loch Ness Marathon
 22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon
 
 

diff --git a/running/index.mdwn b/running/index.mdwn
index a6fd151..a0579f5 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -37,7 +37,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 15. December 31, 2016 [[Silvesterlauf|http://www.berliner-silvesterlauf.de/der-tag-/ergebnisarchiv.html]], 38m16s, 16th overall, [[!strava 816680295]]
 16. January 29, 2017, [[Ferriby 10 Mile|http://www.sportstimingsolutions.co.uk/rcd.php?id=159&bib=19]] 1h00m16s, 23rd overall, [[!strava 848023739]]
 17. February 5, 2017, [[Dewsbury 10k|http://tdleventservices.co.uk/race-results-individual.php?event=2481&competitor_id=735]], 36m12s, 49th overall, [[!strava 855705384]] PB
-18. March 19, 2017, [[East Hull 20 Mile|http://sportstimingsolutions.co.uk/rcd.php?id=164&bib=616]], 2h15m00s, 45th overall [[!strava 906176218]]
+18. March 19, 2017, [[East Hull 20 Mile|http://sportstimingsolutions.co.uk/rcd.php?id=164&bib=616]], 2h15m00s, 44th overall [[!strava 906176218]] (probably shouldn't have run, was injured :(  )
 19. (Didn't run; injured. I marshalled instead) April 1, 2017, Temple Newsam Trail Marathon
 19. May 7, 2017, North Lincolnshire Half Marathon
 19. May 14, 2017, Beverley 10k

diff --git a/running/index.mdwn b/running/index.mdwn
index e5b61cf..a6fd151 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -37,8 +37,8 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 15. December 31, 2016 [[Silvesterlauf|http://www.berliner-silvesterlauf.de/der-tag-/ergebnisarchiv.html]], 38m16s, 16th overall, [[!strava 816680295]]
 16. January 29, 2017, [[Ferriby 10 Mile|http://www.sportstimingsolutions.co.uk/rcd.php?id=159&bib=19]] 1h00m16s, 23rd overall, [[!strava 848023739]]
 17. February 5, 2017, [[Dewsbury 10k|http://tdleventservices.co.uk/race-results-individual.php?event=2481&competitor_id=735]], 36m12s, 49th overall, [[!strava 855705384]] PB
-18. March 19, 2017, East Hull 20 Mile
-19. April 1, 2017, Temple Newsam Trail Marathon
+18. March 19, 2017, [[East Hull 20 Mile|http://sportstimingsolutions.co.uk/rcd.php?id=164&bib=616]], 2h15m00s, 45th overall [[!strava 906176218]]
+19. (Didn't run; injured. I marshalled instead) April 1, 2017, Temple Newsam Trail Marathon
 19. May 7, 2017, North Lincolnshire Half Marathon
 19. May 14, 2017, Beverley 10k
 20. June 25, 2017, Humber Bridge Half Marathon

diff --git a/running/index.mdwn b/running/index.mdwn
index ceb4289..e5b61cf 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -38,7 +38,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 16. January 29, 2017, [[Ferriby 10 Mile|http://www.sportstimingsolutions.co.uk/rcd.php?id=159&bib=19]] 1h00m16s, 23rd overall, [[!strava 848023739]]
 17. February 5, 2017, [[Dewsbury 10k|http://tdleventservices.co.uk/race-results-individual.php?event=2481&competitor_id=735]], 36m12s, 49th overall, [[!strava 855705384]] PB
 18. March 19, 2017, East Hull 20 Mile
-19. (Maybe, but unlikely) April 2, 2017, Manchester Marathon
+19. April 1, 2017, Temple Newsam Trail Marathon
 19. May 7, 2017, North Lincolnshire Half Marathon
 19. May 14, 2017, Beverley 10k
 20. June 25, 2017, Humber Bridge Half Marathon
@@ -47,4 +47,6 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 21. July 30, 2017, Grimsby 10k
 21. (Maybe) September 24, 2017, Hull Marathon (or Loch Ness Marathon?)
 22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon
+
+
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].

diff --git a/running/index.mdwn b/running/index.mdwn
index 80ec15a..ceb4289 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -36,7 +36,7 @@ Since the Hull Marathon (beat my target), I'm just running for fun, no particula
 14. October 30, 2016 Haltemprice 10k, 37m03s, 7th overall, [[!strava 760492671]] PB (got a bit lost and missed a turn, so added ~20-30s and lost a place)
 15. December 31, 2016 [[Silvesterlauf|http://www.berliner-silvesterlauf.de/der-tag-/ergebnisarchiv.html]], 38m16s, 16th overall, [[!strava 816680295]]
 16. January 29, 2017, [[Ferriby 10 Mile|http://www.sportstimingsolutions.co.uk/rcd.php?id=159&bib=19]] 1h00m16s, 23rd overall, [[!strava 848023739]]
-17. February 5, 2017, Dewsbury 10k
+17. February 5, 2017, [[Dewsbury 10k|http://tdleventservices.co.uk/race-results-individual.php?event=2481&competitor_id=735]], 36m12s, 49th overall, [[!strava 855705384]] PB
 18. March 19, 2017, East Hull 20 Mile
 19. (Maybe, but unlikely) April 2, 2017, Manchester Marathon
 19. May 7, 2017, North Lincolnshire Half Marathon

diff --git a/running/index.mdwn b/running/index.mdwn
index 77daf73..80ec15a 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -30,6 +30,9 @@ So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a fe
 11. July 13, 2016 [[Doncaster Town Centre 5k|http://www.sportstimingsolutions.co.uk/rcd.php?id=125&bib=574]], 17m28s, 42nd overall, [[!strava 639933310]] PB
 12. July 15, 2016, [[Walkington 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=127&bib=322]], 37m24s, 15th overall, [[!strava 642011439]] PB
 13. Septemper 18, 2016 [[Hull Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=137&bib=524]], 2h56m11s, 11th overall, [[!strava 716360558]] PB
+
+Since the Hull Marathon (beat my target), I'm just running for fun, no particular goals. Some races:
+
 14. October 30, 2016 Haltemprice 10k, 37m03s, 7th overall, [[!strava 760492671]] PB (got a bit lost and missed a turn, so added ~20-30s and lost a place)
 15. December 31, 2016 [[Silvesterlauf|http://www.berliner-silvesterlauf.de/der-tag-/ergebnisarchiv.html]], 38m16s, 16th overall, [[!strava 816680295]]
 16. January 29, 2017, [[Ferriby 10 Mile|http://www.sportstimingsolutions.co.uk/rcd.php?id=159&bib=19]] 1h00m16s, 23rd overall, [[!strava 848023739]]
@@ -37,7 +40,7 @@ So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a fe
 18. March 19, 2017, East Hull 20 Mile
 19. (Maybe, but unlikely) April 2, 2017, Manchester Marathon
 19. May 7, 2017, North Lincolnshire Half Marathon
-19. (Need to enter) May 14, 2017, Beverley 10k
+19. May 14, 2017, Beverley 10k
 20. June 25, 2017, Humber Bridge Half Marathon
 20. July 12, 2017, Doncaster Town Centre 5k
 20. (Need to enter, date TBC) 14 July, 2017, Walkington 10k

diff --git a/running/index.mdwn b/running/index.mdwn
index 56b593f..77daf73 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -42,6 +42,6 @@ So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a fe
 20. July 12, 2017, Doncaster Town Centre 5k
 20. (Need to enter, date TBC) 14 July, 2017, Walkington 10k
 21. July 30, 2017, Grimsby 10k
-21. (Maybe) September 24, 2017, Hull Marathon
-
+21. (Maybe) September 24, 2017, Hull Marathon (or Loch Ness Marathon?)
+22. November 11, 2017, Hardmoors 26.2 Goathland Trail Marathon
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].

diff --git a/running/index.mdwn b/running/index.mdwn
index 74cb3f3..56b593f 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -3,7 +3,7 @@
 Here I plan to list various races that I have done or will do, while training for the [[Tararua_mountain_race|http://www.tmr.org.nz]].
 
 1. Oct 19 2013, [[Wharf_to_wharf|http://www.thebarrier.co.nz/wharf2wharf.htm]], ran half marathon in 1h55m.
-2. Nov 9 2013, [[Rimutaka_rail_trail_run|http://www.trenthamunited.co.nz/]], half marathon, run in 1h35m35s. PB
+2. Nov 9 2013, [[Rimutaka_rail_trail_run|http://www.trenthamunited.com/archive/2013/results/2013%20Rimutaka%20Rail%20Trail%20results%20v1.3.pdf]], half marathon, run in 1h35m35s. PB
 3. Jan 25, 2014 [[Jumbo-Holdsworth_Trail_Race|http://jumbo-holdsworth.co.nz]], 24 km trail run, 3h17m18s [[!strava 108713131]]
 4. Feb 23, 2014 [[Round_the_bays|http://www.wellingtonroundthebays.co.nz]], 21km, aim for sub-1h30m? I did aim for that, but course was measured long. 1h33m07s. [[!strava 115303364]] PB
 5. Mar 8, 2014 [[Tararua_mountain_race|http://www.tmr.org.nz]], The target... not sure. The result - 5h37m36s, 8th overall. [[!strava 118817072]]

diff --git a/running/index.mdwn b/running/index.mdwn
index 2dede08..74cb3f3 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -17,7 +17,7 @@ Along the way, while training, I would also like to run:
 
 So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a few races, summarised here:
 
-1. Mar 16, 2014 Capital Punishment, 8.3km Hilly race up and down Kaukau. 44m02s [[!strava 120951676]]
+1. Mar 16, 2014 [[Capital Punishment|http://www.olympicharriers.nz/results/event.php?eid=1066]], 8.3km Hilly race up and down Kaukau. 44m02s [[!strava 120951676]] (also did it in [[2013|http://www.olympicharriers.nz/results/event.php?eid=998]] in 45m22s)
 2. Apr 6, 2014 Moonshine Half Marathon, 1h33m55s [[!strava 127302121]]
 3. Apr 13, 2014 [[Three Peaks |http://www.leithharriers.com/threepeaks/results/results2014.pdf]] (Dunedin), 26.3km hilly, 2h40m50s [[!strava 129648317]]
 4. May 3, 2014 [[Rotorua Marathon|http://www.thetimingteam.co.nz/results/index.php?thread=1387910067&strand=1487678040&instance=1794]] Chip time 3h27m43s, target 3h30m [[!strava 136715976]] PB

diff --git a/running/index.mdwn b/running/index.mdwn
index d149cb2..2dede08 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -31,8 +31,8 @@ So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a fe
 12. July 15, 2016, [[Walkington 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=127&bib=322]], 37m24s, 15th overall, [[!strava 642011439]] PB
 13. Septemper 18, 2016 [[Hull Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=137&bib=524]], 2h56m11s, 11th overall, [[!strava 716360558]] PB
 14. October 30, 2016 Haltemprice 10k, 37m03s, 7th overall, [[!strava 760492671]] PB (got a bit lost and missed a turn, so added ~20-30s and lost a place)
-15. December 31, 2016 Silvesterlauf
-16. January 29, 2017, Ferriby 10 Mile
+15. December 31, 2016 [[Silvesterlauf|http://www.berliner-silvesterlauf.de/der-tag-/ergebnisarchiv.html]], 38m16s, 16th overall, [[!strava 816680295]]
+16. January 29, 2017, [[Ferriby 10 Mile|http://www.sportstimingsolutions.co.uk/rcd.php?id=159&bib=19]] 1h00m16s, 23rd overall, [[!strava 848023739]]
 17. February 5, 2017, Dewsbury 10k
 18. March 19, 2017, East Hull 20 Mile
 19. (Maybe, but unlikely) April 2, 2017, Manchester Marathon

diff --git a/running/index.mdwn b/running/index.mdwn
index a547a62..d149cb2 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -35,8 +35,12 @@ So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a fe
 16. January 29, 2017, Ferriby 10 Mile
 17. February 5, 2017, Dewsbury 10k
 18. March 19, 2017, East Hull 20 Mile
-19. (Maybe) April 2, 2017, Manchester Marathon
+19. (Maybe, but unlikely) April 2, 2017, Manchester Marathon
+19. May 7, 2017, North Lincolnshire Half Marathon
+19. (Need to enter) May 14, 2017, Beverley 10k
 20. June 25, 2017, Humber Bridge Half Marathon
+20. July 12, 2017, Doncaster Town Centre 5k
+20. (Need to enter, date TBC) 14 July, 2017, Walkington 10k
 21. July 30, 2017, Grimsby 10k
 21. (Maybe) September 24, 2017, Hull Marathon
 

diff --git a/running/index.mdwn b/running/index.mdwn
index 944accc..a547a62 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -37,6 +37,7 @@ So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a fe
 18. March 19, 2017, East Hull 20 Mile
 19. (Maybe) April 2, 2017, Manchester Marathon
 20. June 25, 2017, Humber Bridge Half Marathon
+21. July 30, 2017, Grimsby 10k
 21. (Maybe) September 24, 2017, Hull Marathon
 
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].

diff --git a/running/index.mdwn b/running/index.mdwn
index f72fddd..944accc 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -29,5 +29,14 @@ So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a fe
 10. Jun 26, 2016 [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=119&bib=299]], 1h22m59s, 21st overall [[!strava 621273867]] PB
 11. July 13, 2016 [[Doncaster Town Centre 5k|http://www.sportstimingsolutions.co.uk/rcd.php?id=125&bib=574]], 17m28s, 42nd overall, [[!strava 639933310]] PB
 12. July 15, 2016, [[Walkington 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=127&bib=322]], 37m24s, 15th overall, [[!strava 642011439]] PB
+13. Septemper 18, 2016 [[Hull Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=137&bib=524]], 2h56m11s, 11th overall, [[!strava 716360558]] PB
+14. October 30, 2016 Haltemprice 10k, 37m03s, 7th overall, [[!strava 760492671]] PB (got a bit lost and missed a turn, so added ~20-30s and lost a place)
+15. December 31, 2016 Silvesterlauf
+16. January 29, 2017, Ferriby 10 Mile
+17. February 5, 2017, Dewsbury 10k
+18. March 19, 2017, East Hull 20 Mile
+19. (Maybe) April 2, 2017, Manchester Marathon
+20. June 25, 2017, Humber Bridge Half Marathon
+21. (Maybe) September 24, 2017, Hull Marathon
 
 I also often participate in parkrun, see [[here|http://www.parkrun.org.uk/results/athleteresultshistory/?athleteNumber=988106]].

diff --git a/ikiwiki.setup b/ikiwiki.setup
index 7f84b75..d2959ab 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 #
 # Setup file for ikiwiki.
 # 
@@ -27,10 +27,14 @@ use IkiWiki::Setup::Standard {
 	cgi_wrapper => '/home/public/wiki/ikiwiki.cgi',
 	# mode for cgi_wrapper (can safely be made suid)
 	cgi_wrappermode => '06755',
+	# number of seconds to delay CGI requests when overloaded
+	cgi_overload_delay => '',
+	# message to display when overloaded (may contain html)
+	cgi_overload_message => '',
 	# rcs backend to use
 	rcs => 'git',
 	# plugins to add to the default configuration
-	add_plugins => [qw{goodstuff remove editdiff rename websetup recentchangesdiff sidebar comments moderatedcomments getsource htmlscrubber}],
+	add_plugins => [qw{goodstuff remove editdiff rename websetup recentchangesdiff sidebar comments moderatedcomments getsource htmlscrubber version}],
 	# plugins to disable
 	disable_plugins => [],
 	# additional directory to search for template files
@@ -51,7 +55,7 @@ use IkiWiki::Setup::Standard {
 	discussion => 1,
 	# name of Discussion pages
 	discussionpage => 'Discussion',
-	# generate HTML5? (experimental)
+	# generate HTML5?
 	html5 => 0,
 	# only send cookies over SSL connections?
 	sslcookie => 0,
@@ -69,8 +73,8 @@ use IkiWiki::Setup::Standard {
 	numbacklinks => 10,
 	# attempt to hardlink source files? (optimisation for large files)
 	hardlink => 0,
-	# force ikiwiki to use a particular umask
-	#umask => 022,
+	# force ikiwiki to use a particular umask (keywords public, group or private, or a number)
+	#umask => 'public',
 	# group for wrappers to run in
 	#wrappergroup => 'ikiwiki',
 	# extra library and plugin directory
@@ -190,17 +194,39 @@ use IkiWiki::Setup::Standard {
 	# mdwn plugin
 	# enable multimarkdown features?
 	multimarkdown => 1,
+	# disable use of markdown discount?
+	#nodiscount => 0,
 
 	######################################################################
-	# misc plugins
-	#   (filecheck)
+	# special-purpose plugins
+	#   (osm)
 	######################################################################
 
+	# osm plugin
+	# the default zoom when you click on the map link
+	#osm_default_zoom => 15,
+	# the icon shown on links and on the main map
+	#osm_default_icon => 'ikiwiki/images/osm.png',
+	# the alt tag of links, defaults to empty
+	#osm_alt => '',
+	# the output format for waypoints, can be KML, GeoJSON or CSV (one or many, comma-separated)
+	#osm_format => 'KML',
+	# the icon attached to a tag, displayed on the map for tagged pages
+	#osm_tag_default_icon => 'icon.png',
+	# Url for the OpenLayers.js file
+	#osm_openlayers_url => 'http://www.openlayers.org/api/OpenLayers.js',
+	# Layers to use in the map. Can be either the 'OSM' string or a type option for Google maps (GoogleNormal, GoogleSatellite, GoogleHybrid or GooglePhysical). It can also be an arbitrary URL in a syntax acceptable for OpenLayers.Layer.OSM.url parameter.
+	#osm_layers => {
+	#  OSM => 'GoogleSatellite'
+	#},
+	# Google maps API key, Google layer not used if missing, see https://code.google.com/apis/console/ to get an API key
+	#osm_google_apikey => '',
+
 	######################################################################
 	# web plugins
 	#   (404, attachment, comments, editdiff, edittemplate, getsource,
 	#    google, goto, mirrorlist, remove, rename, repolist, search,
-	#    theme, websetup, wmd)
+	#    theme, userlist, websetup, wmd)
 	######################################################################
 
 	# attachment plugin
@@ -211,7 +237,7 @@ use IkiWiki::Setup::Standard {
 
 	# comments plugin
 	# PageSpec of pages where comments are allowed
-	comments_pagespec => 'posts/* and !*/Discussion',
+	comments_pagespec => '(posts/* or travel/*) and !*/Discussion',
 	# PageSpec of pages where posting new comments is not allowed
 	comments_closed_pagespec => '',
 	# Base name for comments, e.g. "comment_" for pages like "sandbox/comment_12"
@@ -230,6 +256,8 @@ use IkiWiki::Setup::Standard {
 	# mirrorlist plugin
 	# list of mirrors
 	#mirrorlist => {},
+	# generate links that point to the mirrors' ikiwiki CGI
+	#mirrorlist_use_cgi => 1,
 
 	# repolist plugin
 	# URIs of repositories containing the wiki's source
@@ -254,10 +282,10 @@ use IkiWiki::Setup::Standard {
 	######################################################################
 	# widget plugins
 	#   (calendar, color, conditional, cutpaste, date, format, fortune,
-	#    graphviz, haiku, img, linkmap, listdirectives, map, more,
-	#    orphans, pagecount, pagestats, poll, polygen, postsparkline,
-	#    progress, shortcut, sparkline, table, template, teximg, toc,
-	#    toggle, version)
+	#    graphviz, haiku, headinganchors, img, linkmap, listdirectives,
+	#    map, more, orphans, pagecount, pagestats, poll, polygen,
+	#    postsparkline, progress, shortcut, sparkline, table, template,
+	#    teximg, toc, toggle, version)
 	######################################################################
 
 	# calendar plugin
@@ -287,12 +315,12 @@ use IkiWiki::Setup::Standard {
 
 	######################################################################
 	# other plugins
-	#   (aggregate, autoindex, brokenlinks, camelcase, ddate, embed,
-	#    favicon, flattr, goodstuff, htmlbalance, localstyle,
-	#    pagetemplate, pingee, pinger, prettydate, recentchanges,
-	#    recentchangesdiff, relativedate, rsync, sidebar, smiley,
-	#    sortnaturally, tag, testpagespec, transient, typography,
-	#    underlay)
+	#   (aggregate, amazon_s3, autoindex, brokenlinks, camelcase,
+	#    ddate, embed, favicon, filecheck, flattr, goodstuff,
+	#    htmlbalance, localstyle, notifyemail, pagetemplate, pingee,
+	#    pinger, prettydate, recentchanges, recentchangesdiff,
+	#    relativedate, rsync, sidebar, smiley, sortnaturally, tag,
+	#    testpagespec, trail, transient, typography, underlay)
 	######################################################################
 
 	# aggregate plugin
@@ -305,6 +333,20 @@ use IkiWiki::Setup::Standard {
 	  file => '/home/private/.ikiwiki/cookies'
 	},
 
+	# amazon_s3 plugin
+	# public access key id
+	#amazon_s3_key_id => 'XXXXXXXXXXXXXXXXXXXX',
+	# file holding secret key (must not be readable by others!)
+	#amazon_s3_key_id => '/home/private/.s3_key',
+	# globally unique name of bucket to store wiki in
+	#amazon_s3_bucket => 'mywiki',
+	# a prefix to prepend to each page name
+	#amazon_s3_prefix => 'wiki/',
+	# which S3 datacenter to use (leave blank for default)
+	#amazon_s3_location => 'EU',
+	# store each index file twice? (allows urls ending in "/index.html" and "/")
+	#amazon_s3_dupindex => 0,
+
 	# autoindex plugin
 	# commit autocreated index pages
 	autoindex_commit => 1,
diff --git a/running/index.mdwn b/running/index.mdwn
index 6fbb5dd..f72fddd 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -3,10 +3,10 @@
 Here I plan to list various races that I have done or will do, while training for the [[Tararua_mountain_race|http://www.tmr.org.nz]].
 
 1. Oct 19 2013, [[Wharf_to_wharf|http://www.thebarrier.co.nz/wharf2wharf.htm]], ran half marathon in 1h55m.
-2. Nov 9 2013, [[Rimutaka_rail_trail_run|http://www.trenthamunited.co.nz/]], half marathon, run in 1h35m35s.
-3. Jan 25, 2014 [[Jumbo-Holdsworth_Trail_Race|http://jumbo-holdsworth.co.nz]], 24 km trail run
-4. Feb 23, 2014 [[Round_the_bays|http://www.wellingtonroundthebays.co.nz]], 21km, aim for sub-1h30m?
-5. Mar 8, 2014 [[Tararua_mountain_race|http://www.tmr.org.nz]], The target...
+2. Nov 9 2013, [[Rimutaka_rail_trail_run|http://www.trenthamunited.co.nz/]], half marathon, run in 1h35m35s. PB
+3. Jan 25, 2014 [[Jumbo-Holdsworth_Trail_Race|http://jumbo-holdsworth.co.nz]], 24 km trail run, 3h17m18s [[!strava 108713131]]
+4. Feb 23, 2014 [[Round_the_bays|http://www.wellingtonroundthebays.co.nz]], 21km, aim for sub-1h30m? I did aim for that, but course was measured long. 1h33m07s. [[!strava 115303364]] PB
+5. Mar 8, 2014 [[Tararua_mountain_race|http://www.tmr.org.nz]], The target... not sure. The result - 5h37m36s, 8th overall. [[!strava 118817072]]
 
 
 Along the way, while training, I would also like to run:
@@ -15,3 +15,19 @@ Along the way, while training, I would also like to run:
 2. The *normal* Tararua mountain race course (needs to be timed carefully... and nice weather)
 
 
+So, my next challenge is the 2016 Hull Marathon. Since the TMR, I have done a few races, summarised here:
+
+1. Mar 16, 2014 Capital Punishment, 8.3km Hilly race up and down Kaukau. 44m02s [[!strava 120951676]]
+2. Apr 6, 2014 Moonshine Half Marathon, 1h33m55s [[!strava 127302121]]
+3. Apr 13, 2014 [[Three Peaks |http://www.leithharriers.com/threepeaks/results/results2014.pdf]] (Dunedin), 26.3km hilly, 2h40m50s [[!strava 129648317]]
+4. May 3, 2014 [[Rotorua Marathon|http://www.thetimingteam.co.nz/results/index.php?thread=1387910067&strand=1487678040&instance=1794]] Chip time 3h27m43s, target 3h30m [[!strava 136715976]] PB
+5. May 31, 2014 Wellington Mountain Running Championships, 4th Senior Mens, 54m38s [[!strava 147466955]]
+6. Jun 8, 2014 [[Three peaks race 1|http://scottishathletics.org.nz/News/three-peaks-event-1-2014]] [[results|http://scottishathletics.org.nz/DesktopModules/EasyDNNNews/DocumentDownload.ashx?portalid=10&moduleid=2115&articleid=2042&documentid=186]] (Wellington), 7th place, 1h43m, free to choose own course [[!strava 150719561]]
+7. Jun 22, 2014 [[Wellington 10km|https://secure.tiktok.biz/results/view/wellingtonmarathon/2014/5784]], 19th place, 38m13s [[!strava 156437871]] PB
+8. May 8, 2016 [[Beverley 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=108&bib=498]] in 37m39s, 22nd overall [[!strava 569320624]] PB
+9. Jun 11, 2016 [[Kirkstall Abbey Trail Half Marathon|https://racebest.com/results/queens-birthday-bash-kirkstall-trail-race]], 1st place, 1h25m26s [[!strava 605764686]] PB
+10. Jun 26, 2016 [[Humber Bridge Half Marathon|http://www.sportstimingsolutions.co.uk/rcd.php?id=119&bib=299]], 1h22m59s, 21st overall [[!strava 621273867]] PB
+11. July 13, 2016 [[Doncaster Town Centre 5k|http://www.sportstimingsolutions.co.uk/rcd.php?id=125&bib=574]], 17m28s, 42nd overall, [[!strava 639933310]] PB
+12. July 15, 2016, [[Walkington 10k|http://www.sportstimingsolutions.co.uk/rcd.php?id=127&bib=322]], 37m24s, 15th overall, [[!strava 642011439]] PB
+

(Diff truncated)

diff --git a/shortcuts.mdwn b/shortcuts.mdwn
new file mode 100644
index 0000000..e58ee6c
--- /dev/null
+++ b/shortcuts.mdwn
@@ -0,0 +1,87 @@
+[[!if test="enabled(shortcut)"
+     then="This wiki has shortcuts **enabled**."
+     else="This wiki has shortcuts **disabled**."]]
+
+Some examples of using shortcuts include:
+
+	\[[!google foo]]
+	\[[!wikipedia War_of_1812]]
+	\[[!debbug 12345]]
+	Check the \[[!google ikiwiki desc="google search for %s"]].
+
+This page controls what shortcut links the wiki supports.
+
+* [[!shortcut name=google url="https://encrypted.google.com/search?q=%s"]]
+* [[!shortcut name=archive url="http://web.archive.org/*/%S"]]
+* [[!shortcut name=gmap url="https://maps.google.com/maps?q=%s"]]
+* [[!shortcut name=gmsg url="https://groups.google.com/groups?selm=%s"]]
+* [[!shortcut name=wikipedia url="https://en.wikipedia.org/wiki/%W"]]
+* [[!shortcut name=wikitravel url="https://wikitravel.org/en/%s"]]
+* [[!shortcut name=wiktionary url="https://en.wiktionary.org/wiki/%s"]]
+* [[!shortcut name=debbug url="http://bugs.debian.org/%S" desc="Debian bug #%s"]]
+* [[!shortcut name=deblist url="https://lists.debian.org/debian-%s" desc="debian-%s@lists.debian.org"]]
+* [[!shortcut name=debpkg url="http://packages.debian.org/%s"]]
+* [[!shortcut name=debpkgsid url="http://packages.debian.org/sid/%s"]]
+* [[!shortcut name=debpts url="http://packages.qa.debian.org/%s"]]
+* [[!shortcut name=debmsg url="https://lists.debian.org/msgid-search/%s"]]
+* [[!shortcut name=debrt url="https://rt.debian.org/Ticket/Display.html?id=%s"]]
+* [[!shortcut name=debss url="http://snapshot.debian.org/package/%s/"]]
+  * Usage: `\[[!debss package]]` or `\[[!debss package/version]]`.  See <http://snapshot.debian.org/> for details.
+* [[!shortcut name=debwiki url="https://wiki.debian.org/%S"]]
+* [[!shortcut name=fdobug url="https://bugs.freedesktop.org/show_bug.cgi?id=%s" desc="freedesktop.org bug #%s"]]
+* [[!shortcut name=fdolist url="http://lists.freedesktop.org/mailman/listinfo/%s" desc="%s@lists.freedesktop.org"]]
+* [[!shortcut name=gnomebug url="https://bugzilla.gnome.org/show_bug.cgi?id=%s" desc="GNOME bug #%s"]]
+* [[!shortcut name=linuxbug url="https://bugzilla.kernel.org/show_bug.cgi?id=%s" desc="Linux bug #%s"]]
+* [[!shortcut name=mozbug url="https://bugzilla.mozilla.org/show_bug.cgi?id=%s" desc="Mozilla bug #%s"]]
+* [[!shortcut name=gnulist url="https://lists.gnu.org/mailman/listinfo/%s" desc="%s@gnu.org"]]
+* [[!shortcut name=marcmsg url="http://marc.info/?i=%s"]]
+* [[!shortcut name=marclist url="http://marc.info/?l=%s"]]
+* [[!shortcut name=gmane url="http://dir.gmane.org/gmane.%s" desc="gmane.%s"]]
+* [[!shortcut name=gmanemsg url="http://mid.gmane.org/%s"]]
+* [[!shortcut name=cpan url="http://search.cpan.org/search?mode=dist&query=%s"]]
+* [[!shortcut name=ctan url="http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=%s"]]
+* [[!shortcut name=hoogle url="http://haskell.org/hoogle/?q=%s"]]
+* [[!shortcut name=iki url="http://ikiwiki.info/%S/"]]
+* [[!shortcut name=ljuser url="http://%s.livejournal.com/"]]
+* [[!shortcut name=rfc url="https://www.ietf.org/rfc/rfc%s.txt" desc="RFC %s"]]
+* [[!shortcut name=c2 url="http://c2.com/cgi/wiki?%s"]]
+* [[!shortcut name=meatballwiki url="http://www.usemod.com/cgi-bin/mb.pl?%s"]]
+* [[!shortcut name=emacswiki url="http://www.emacswiki.org/cgi-bin/wiki/%s"]]
+* [[!shortcut name=haskellwiki url="http://haskell.org/haskellwiki/%s"]]
+* [[!shortcut name=dict url="http://www.dict.org/bin/Dict?Form=Dict1&Strategy=*&Database=*&Query=%s"]]
+* [[!shortcut name=imdb url="http://imdb.com/find?q=%s"]]
+* [[!shortcut name=gpg url="http://pgpkeys.mit.edu:11371/pks/lookup?op=vindex&exact=on&search=0x%s"]]
+* [[!shortcut name=perldoc url="http://perldoc.perl.org/search.html?q=%s"]]
+* [[!shortcut name=whois url="http://reports.internic.net/cgi/whois?whois_nic=%s&type=domain"]]
+* [[!shortcut name=cve url="https://cve.mitre.org/cgi-bin/cvename.cgi?name=%s"]]
+* [[!shortcut name=flickr url="https://secure.flickr.com/photos/%s"]]
+* [[!shortcut name=man url="http://manpages.debian.org/%s"]]
+* [[!shortcut name=ohloh url="https://www.ohloh.net/p/%s"]]
+* [[!shortcut name=cpanrt url="https://rt.cpan.org/Ticket/Display.html?id=%s" desc="CPAN RT#%s"]]
+* [[!shortcut name=novellbug url="https://bugzilla.novell.com/show_bug.cgi?id=%s" desc="bug %s"]]
+* [[!shortcut name=ubupkg url="http://packages.ubuntu.com/%s"]]
+* [[!shortcut name=mozillazinekb url="http://kb.mozillazine.org/%s"]]
+* [[!shortcut name=freebsdwiki url="http://wiki.freebsd.org/%s"]]
+* [[!shortcut name=hackage url="http://hackage.haskell.org/package/%s"]]
+* [[!shortcut name=pkgsrc url="http://pkgsrc.se/%S"]]
+* [[!shortcut name=doi url="http://dx.doi.org/%s" desc="doi:%s"]]
+* [[!shortcut name=arxiv url="http://arxiv.org/abs/%s" desc="arXiv:%s"]]
+* [[!shortcut name=strava url="https://www.strava.com/activities/%s"]]
+
+To add a new shortcut, use the `shortcut`
+[[ikiwiki/directive]]. In the url, "%s" is replaced with the
+text passed to the named shortcut, after [[!wikipedia url_encoding]]
+it, and '%S' is replaced with the raw, non-encoded text. 
+Additionally, `%W` is replaced with the text encoded just right for
+Wikipedia. The optional `desc` parameter controls the description of
+the link.
+
+Remember that the `name` you give the shortcut will become a new
+[[ikiwiki/directive]].  Avoid using a `name` that conflicts
+with an existing directive.  These directives also accept a `desc`
+parameter that will override the one provided at definition time.
+
+If you come up with a shortcut that you think others might find useful,
+consider contributing it to the [shortcuts page on the ikiwiki
+wiki](http://ikiwiki.info/shortcuts/), so that future versions of
+ikiwiki will include your shortcut in the standard underlay.

diff --git a/running/index.mdwn b/running/index.mdwn
index a729b6a..6fbb5dd 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -1,12 +1,12 @@
 [[!meta title="Running plan"]]
 
-Here I plan to list various races that I have done or will do, while training for the [[Tararua_mountain_race|http://www.tararua-race.org.nz]].
+Here I plan to list various races that I have done or will do, while training for the [[Tararua_mountain_race|http://www.tmr.org.nz]].
 
 1. Oct 19 2013, [[Wharf_to_wharf|http://www.thebarrier.co.nz/wharf2wharf.htm]], ran half marathon in 1h55m.
 2. Nov 9 2013, [[Rimutaka_rail_trail_run|http://www.trenthamunited.co.nz/]], half marathon, run in 1h35m35s.
 3. Jan 25, 2014 [[Jumbo-Holdsworth_Trail_Race|http://jumbo-holdsworth.co.nz]], 24 km trail run
 4. Feb 23, 2014 [[Round_the_bays|http://www.wellingtonroundthebays.co.nz]], 21km, aim for sub-1h30m?
-5. Mar 8, 2014 [[Tararua_mountain_race|http://www.tararua-race.org.nz]], The target...
+5. Mar 8, 2014 [[Tararua_mountain_race|http://www.tmr.org.nz]], The target...
 
 
 Along the way, while training, I would also like to run:

diff --git a/running/index.mdwn b/running/index.mdwn
index 135e1ce..a729b6a 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -4,7 +4,7 @@ Here I plan to list various races that I have done or will do, while training fo
 
 1. Oct 19 2013, [[Wharf_to_wharf|http://www.thebarrier.co.nz/wharf2wharf.htm]], ran half marathon in 1h55m.
 2. Nov 9 2013, [[Rimutaka_rail_trail_run|http://www.trenthamunited.co.nz/]], half marathon, run in 1h35m35s.
-3. Jan 25, 2014 [[Jumbo-Holdsworth_Trail_Race|http://techs.net.nz/trusthouse.co.nz/sport/mountain/hjtr-event.htm]], 24 km trail run
+3. Jan 25, 2014 [[Jumbo-Holdsworth_Trail_Race|http://jumbo-holdsworth.co.nz]], 24 km trail run
 4. Feb 23, 2014 [[Round_the_bays|http://www.wellingtonroundthebays.co.nz]], 21km, aim for sub-1h30m?
 5. Mar 8, 2014 [[Tararua_mountain_race|http://www.tararua-race.org.nz]], The target...
 

diff --git a/running/index.mdwn b/running/index.mdwn
index 390015d..135e1ce 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -3,7 +3,7 @@
 Here I plan to list various races that I have done or will do, while training for the [[Tararua_mountain_race|http://www.tararua-race.org.nz]].
 
 1. Oct 19 2013, [[Wharf_to_wharf|http://www.thebarrier.co.nz/wharf2wharf.htm]], ran half marathon in 1h55m.
-2. Nov 9 2013, [[Rimutaka_rail_trail_run|http://www.trenthamunited.co.nz/]], half marathon
+2. Nov 9 2013, [[Rimutaka_rail_trail_run|http://www.trenthamunited.co.nz/]], half marathon, run in 1h35m35s.
 3. Jan 25, 2014 [[Jumbo-Holdsworth_Trail_Race|http://techs.net.nz/trusthouse.co.nz/sport/mountain/hjtr-event.htm]], 24 km trail run
 4. Feb 23, 2014 [[Round_the_bays|http://www.wellingtonroundthebays.co.nz]], 21km, aim for sub-1h30m?
 5. Mar 8, 2014 [[Tararua_mountain_race|http://www.tararua-race.org.nz]], The target...

diff --git a/running/index.mdwn b/running/index.mdwn
index 182ab03..390015d 100644
--- a/running/index.mdwn
+++ b/running/index.mdwn
@@ -8,3 +8,10 @@ Here I plan to list various races that I have done or will do, while training fo
 4. Feb 23, 2014 [[Round_the_bays|http://www.wellingtonroundthebays.co.nz]], 21km, aim for sub-1h30m?
 5. Mar 8, 2014 [[Tararua_mountain_race|http://www.tararua-race.org.nz]], The target...
 
+
+Along the way, while training, I would also like to run:
+
+1. The [[Mukumuka_Munter|http://www.betterthantv.co.nz/munter.html]] course, but missed the race already
+2. The *normal* Tararua mountain race course (needs to be timed carefully... and nice weather)
+
+

diff --git a/uni/upgoer5/trial.mdwn b/uni/upgoer5/trial.mdwn
index d58871c..7bb3901 100644
--- a/uni/upgoer5/trial.mdwn
+++ b/uni/upgoer5/trial.mdwn
@@ -1 +1,2 @@
 food hotter made of glass and mirror powered by light
+works best with really short food

diff --git a/index.mdwn b/index.mdwn
index 1312360..93c3bbb 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,7 @@ There is a page of univeristy-related stuff at [[uni]].
 
 There are some thoughts related to our movie [[Mini Shark vs Tiny Octopus|msvto]].
 
-There are some [[upcoming and past races|running/]].
+There are some [[upcoming and past races|running/index]].
 
 
 ----

diff --git a/index.mdwn b/index.mdwn
index 583fff1..1312360 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,8 +15,8 @@ There is a page of univeristy-related stuff at [[uni]].
 
 There are some thoughts related to our movie [[Mini Shark vs Tiny Octopus|msvto]].
 
-There are some [[upcoming and past races|running]].
-]
+There are some [[upcoming and past races|running/]].
+
 
 ----
 

diff --git a/index.mdwn b/index.mdwn
index e2300d5..583fff1 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,7 +15,9 @@ There is a page of univeristy-related stuff at [[uni]].
 
 There are some thoughts related to our movie [[Mini Shark vs Tiny Octopus|msvto]].
 
-There are some [[upcoming and past races|running/index]]
+There are some [[upcoming and past races|running]].
+]
+
 ----
 
 This wiki is powered by [ikiwiki](http://ikiwiki.info), version [[!version ]].

diff --git a/index.mdwn b/index.mdwn
index f7f5ed3..e2300d5 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -15,6 +15,7 @@ There is a page of univeristy-related stuff at [[uni]].
 
 There are some thoughts related to our movie [[Mini Shark vs Tiny Octopus|msvto]].
 
+There are some [[upcoming and past races|running/index]]
 ----
 
 This wiki is powered by [ikiwiki](http://ikiwiki.info), version [[!version ]].

diff --git a/running/index.mdwn b/running/index.mdwn
new file mode 100644
index 0000000..182ab03
--- /dev/null
+++ b/running/index.mdwn
@@ -0,0 +1,10 @@
+[[!meta title="Running plan"]]
+
+Here I plan to list various races that I have done or will do, while training for the [[Tararua_mountain_race|http://www.tararua-race.org.nz]].
+
+1. Oct 19 2013, [[Wharf_to_wharf|http://www.thebarrier.co.nz/wharf2wharf.htm]], ran half marathon in 1h55m.
+2. Nov 9 2013, [[Rimutaka_rail_trail_run|http://www.trenthamunited.co.nz/]], half marathon
+3. Jan 25, 2014 [[Jumbo-Holdsworth_Trail_Race|http://techs.net.nz/trusthouse.co.nz/sport/mountain/hjtr-event.htm]], 24 km trail run
+4. Feb 23, 2014 [[Round_the_bays|http://www.wellingtonroundthebays.co.nz]], 21km, aim for sub-1h30m?
+5. Mar 8, 2014 [[Tararua_mountain_race|http://www.tararua-race.org.nz]], The target...
+

diff --git a/uni/upgoer5/trial.mdwn b/uni/upgoer5/trial.mdwn
new file mode 100644
index 0000000..d58871c
--- /dev/null
+++ b/uni/upgoer5/trial.mdwn
@@ -0,0 +1 @@
+food hotter made of glass and mirror powered by light

diff --git a/programming.mdwn b/programming.mdwn
index 4fc71df..a0fc313 100644
--- a/programming.mdwn
+++ b/programming.mdwn
@@ -1,13 +1,17 @@
 This page lists some programming stuff I've done; it is not a complete list.
 
 ##VUW Timetable application
-[[/programming/Timetabler-20130928.jar]]
+[[/programming/Timetabler-20130930.jar]]
 
 You should realise that this program is a collection of bugs, which sometimes work together to produce some useful results. However, any deviation from a certain input will result in unpredictable output. There is a [[todo list|programming/timetableTODO]].
 
+20130930
+
+* Make load correct website for the specified year, so it doesn't just always use current year.
+
 20130928
 
-Update to work with new VUW website. I hope they don't change it again anytime soon...
+* Update to work with new VUW website. I hope they don't change it again anytime soon...
 
 20101112
 
diff --git a/programming/Timetabler-20130930.jar b/programming/Timetabler-20130930.jar
new file mode 100644
index 0000000..e053bfb
Binary files /dev/null and b/programming/Timetabler-20130930.jar differ

diff --git a/programming/Timetabler-20130928.jar b/programming/Timetabler-20130928.jar
index 48baa75..dd8fcf7 100755
Binary files a/programming/Timetabler-20130928.jar and b/programming/Timetabler-20130928.jar differ

diff --git a/programming.mdwn b/programming.mdwn
index 32fe620..4fc71df 100644
--- a/programming.mdwn
+++ b/programming.mdwn
@@ -1,7 +1,7 @@
 This page lists some programming stuff I've done; it is not a complete list.
 
 ##VUW Timetable application
-[[/programmingTtimetabler-20130928.jar]]
+[[/programming/Timetabler-20130928.jar]]
 
 You should realise that this program is a collection of bugs, which sometimes work together to produce some useful results. However, any deviation from a certain input will result in unpredictable output. There is a [[todo list|programming/timetableTODO]].
 

diff --git a/programming.mdwn b/programming.mdwn
index be60b67..32fe620 100644
--- a/programming.mdwn
+++ b/programming.mdwn
@@ -1,10 +1,14 @@
 This page lists some programming stuff I've done; it is not a complete list.
 
 ##VUW Timetable application
-[[/programming/timetabler.jar]]
+[[/programmingTtimetabler-20130928.jar]]
 
 You should realise that this program is a collection of bugs, which sometimes work together to produce some useful results. However, any deviation from a certain input will result in unpredictable output. There is a [[todo list|programming/timetableTODO]].
 
+20130928
+
+Update to work with new VUW website. I hope they don't change it again anytime soon...
+
 20101112
 
 * Make the saved images use the correct-sized canvas
diff --git a/programming/Timetabler-20130928.jar b/programming/Timetabler-20130928.jar
new file mode 100755
index 0000000..48baa75
Binary files /dev/null and b/programming/Timetabler-20130928.jar differ

diff --git a/travel/Dijon-bound.mdwn b/travel/Dijon-bound.mdwn
index 47d3348..c6346f6 100644
--- a/travel/Dijon-bound.mdwn
+++ b/travel/Dijon-bound.mdwn
@@ -12,6 +12,8 @@ Arriving in Paris, the landing was the worst I have had for a long time, as the
 
 Paris airport was easy, except the luggage seemed to take a while (a big, full plane), and the queue for the immigration was slow (only for the man to simply stamp my passport, not even say anything to me).
 
-Then a long (10 minute) walk within the terminal to get to the train station, buy a ticket, and head to Denfert-Rochereau, on the RER B. Arrived at Antoines (I even remebered the way) at just after 12, and my plane landed at ~10, so two hours. That was from out of Schengen though.
+Then a long (10 minute) walk within the terminal to get to the train station, buy a ticket, and head to Denfert-Rochereau, on the RER B. Arrived at Antoine's (I even remebered the way) at just after 12, and my plane landed at ~10, so two hours. That was from out of Schengen though.
 
-It was nice seeing Antoine, and we went for a crêpe for lunch, then bought a SIM card (lebara.fr), and caught the RER to Saint-Michel Notre Dame, and went for a walk along the Seine. Then, another (sweet) crêpe, and back to his place, before catching a couple of Metros to Gare de Lyo, where I caught the TGV to Dijon. Currently we're rocketing through the french countryside, and I get off at the first stop. Camille's parents should be meeting me, so that will be nice. I'm looking forward to staying in Dijon for an extended period.
+It was nice seeing Antoine, and we went for a crêpe for lunch, then bought a SIM card (lebara.fr), and caught the RER to Saint-Michel Notre Dame, and went for a walk along the Seine. Then, another (sweet) crêpe, and back to his place, before catching a couple of Metros to Gare de Lyon, where I caught the TGV to Dijon. Currently we're rocketing through the french countryside, and I get off at the first stop. Camille's parents should be meeting me, so that will be nice. I'm looking forward to staying in Dijon for an extended period.
+
+[[!meta title="Dijon-bound]]

diff --git a/travel/london.mdwn b/travel/london.mdwn
new file mode 100644
index 0000000..c8b35fc
--- /dev/null
+++ b/travel/london.mdwn
@@ -0,0 +1,6 @@
+[[!meta title="London"]]
+So, the last stop on my trip, and probably the least eventful journey.
+
+I had an easy trip to the airport (Tegel; just a few stops on the U6 from Lina and Jonnel's, and then change to a bus, all included in the weekly ticket I had bought for use in Berlin). Tegel seems a bit odd, in that there are check-in counters by each gate, and also the security/passport control is for just one or two gates. I think it is nice, as the queues become much more manageable.
+
+The flight was uneventful and on time, and I arrived at the C-gates of Heathrow Terminal 5. This entails catching a train to the main part of terminal 5 where the immigration/baggage all is. Immigration was much less rude than on the Eurostar, and I didn't have to wait too long for the bag. However, there was a ~20 minute wait for the train to Gwynne's. Still, with a quick change at Barons Court, I made it, now one full (and fairly warm) day in London to go before beginning the trip back home.

diff --git a/travel/berlin.mdwn b/travel/berlin.mdwn
new file mode 100644
index 0000000..b0a6f6a
--- /dev/null
+++ b/travel/berlin.mdwn
@@ -0,0 +1,8 @@
+[[!meta title="Berlin"]]
+So I have arrived in Berlin.
+
+Yesterday Peggy and John dropped me off at Morlaix train station, and I caught a TGV to Paris Gare Montparnasse.
+
+In Paris I changed via Metro to Gare de l'Est, and waited for my train for a bit. For some reason (price, I guess), I was on a ICE to Mannheim (near Frankfurt), and then had a 90 minute wait for the CityNightLine train to Berlin. I was in a two-berth cabin, which was comfortable enough, though I found it hard to sleep, possible all the moving around.
+
+This morning it arrived in Berlin, and I got on a bus to Lina and Jonnel's place. I have 5 days here before flying out to London.

diff --git a/travel/to_bretagne.mdwn b/travel/to_bretagne.mdwn
index 3c511d4..3997b19 100644
--- a/travel/to_bretagne.mdwn
+++ b/travel/to_bretagne.mdwn
@@ -1,6 +1,6 @@
 So today I travelled from Cambridge to somewhere in the middle of nowhere in Bretagne, France.
 
-This started with returning the bike (in the rain) that I hired yesterday in Cambridge, then returning to Shriv's to grab my suitcase before heading off to the train station. However, many trains were late/cancelled due to the storms of last night, including the one I meant to catch. However, about half an hour later, another train to Liverpool St left, which I got on, only for it to change its destination to Bishops S...... (I forget, will look up later) just before departure. At that stop, we all got off, the train returned to Cambridge, and a few minutes later another train to Liverpool Street arrived, which I (and some other people got on). However, owing to a lightning strike on some signals, this was a slow trip.
+This started with returning the bike (in the rain) that I hired yesterday in Cambridge, then returning to Shriv's to grab my suitcase before heading off to the train station. However, many trains were late/cancelled due to the storms of last night, including the one I meant to catch. However, about half an hour later, another train to Liverpool St left, which I got on, only for it to change its destination to Bishop's Stortford just before departure. At that stop, we all got off, the train returned to Cambridge, and a few minutes later another train to Liverpool Street arrived, which I (and some other people got on). However, owing to a lightning strike on some signals, this was a slow trip.
 
 Luckily I had allowed plenty of time, as even arriving about 90 minutes late, I still had about 20 minutes to spare after getting on the tube to Bank, and changing to the DLR to London City Airport.
 

diff --git a/travel/to_bretagne.mdwn b/travel/to_bretagne.mdwn
new file mode 100644
index 0000000..3c511d4
--- /dev/null
+++ b/travel/to_bretagne.mdwn
@@ -0,0 +1,11 @@
+So today I travelled from Cambridge to somewhere in the middle of nowhere in Bretagne, France.
+
+This started with returning the bike (in the rain) that I hired yesterday in Cambridge, then returning to Shriv's to grab my suitcase before heading off to the train station. However, many trains were late/cancelled due to the storms of last night, including the one I meant to catch. However, about half an hour later, another train to Liverpool St left, which I got on, only for it to change its destination to Bishops S...... (I forget, will look up later) just before departure. At that stop, we all got off, the train returned to Cambridge, and a few minutes later another train to Liverpool Street arrived, which I (and some other people got on). However, owing to a lightning strike on some signals, this was a slow trip.
+
+Luckily I had allowed plenty of time, as even arriving about 90 minutes late, I still had about 20 minutes to spare after getting on the tube to Bank, and changing to the DLR to London City Airport.
+
+This airport is cool (and small), with a 15 minute checkin, and very fast security (no queues). Also, I got to walk from the terminal out on the tarmac to get on the plane, a Fokker 50 (small-ish propellor plane).
+
+The flight to Brest (France) was fast, about 1 hour 20, and on arrival everything was very fast, the main point of note was that the immigration officer had to search in the cupboard for the passport stamp for me, obviously not many non-europeans come this way. It even didn't take long for the luggage to turn up, and Peggy and John were waiting for me at the airport.
+
+I'm here until Thursday afternoon, when I head off to Berlin.

diff --git a/travel/to_england.mdwn b/travel/to_england.mdwn
new file mode 100644
index 0000000..f087efb
--- /dev/null
+++ b/travel/to_england.mdwn
@@ -0,0 +1,7 @@
+So, I am on a train just leaving King's Cross for Cambridge. This morning I had a fairly leisurely start (I think the first time for travelling so far), though the slightly late shuttle to Palermo Airport was a bit concerning, the total disregard for speed limits saw all eight of us there with plenty of time.
+
+The plane was on time (!) to Rome, and I was meant to have about 90 minutes there. That turned into over two hours, as the plane was of course delayed. However, no problem, as I had planned for the Italians to not be punctual, and so I had plenty of time to get to Gare du Nord for the Eurostar. Of course, that was on time, as is (so far) the (much noiser, so it actually seems faster) train to Cambridge.
+
+I am looking forward to seeing Shrividya and Dmitri there, as well as Hannah Stern, and Natalie, Justin, Alex (yes, we all live in Wellington, let's meet in Cambridge!).
+
+So, no more travel until Tuesday, when I fly from London to Brest. (London City Airport, which I think is even smaller than Wellington's).

diff --git a/travel/sicily.mdwn b/travel/sicily.mdwn
new file mode 100644
index 0000000..9eff9f3
--- /dev/null
+++ b/travel/sicily.mdwn
@@ -0,0 +1,11 @@
+So, I have arrived in Sicily.
+
+Got up at 5.30am, to catch a train (which was LATE!, though only about 10 minutes) to Roissy-Charles de Gaulle Airport. After checking in, and a really long queue to drop my baggage off, it was very easy getting through security, with no queue at all.
+
+The flight to Rome was late (initially they claimed 10 minutes, but it ended up about 30 minutes), so I missed the connection to Palermo. However, in contrast to the [[canadian experience|something_had_to_go_wrong]], where I had to go to a desk and have them find a new route for me, and issue new bordning passes, here there were people immediately inside the arrivals area, already with new bording passes. Perhaps it is a common occurence.
+
+Anyway, didn't have very long to wait for the short flight to Palermo, where of course the shuttle I was meant to catch had left already. Luckily, there was another one, so I got that. Had to wait around for a bit (~1 hour), as it was taking people from another flight also.
+
+After maybe a 1 hour drive, arrived in Erice, which is a nice town, lovely stone streets, a bit maze like though. Hopefully will get to explore it some more.
+
+Lectures start tomorrow at 9am.

diff --git a/index.mdwn b/index.mdwn
index 469afde..f7f5ed3 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -3,7 +3,7 @@
 Welcome to my wiki.
 
 I have a small, infrequently-updated blog you can see at [[blog]].
-
+Also, there is a travel blog at [[travelblog]].
 
 I have a list of [[links]] I want to remember.
 
diff --git a/travel/suisse.mdwn b/travel/suisse.mdwn
new file mode 100644
index 0000000..ef4a76f
--- /dev/null
+++ b/travel/suisse.mdwn
@@ -0,0 +1,19 @@
+[[!meta title="Mon voyage en Suisse"]]
+
+So, I have just returned from a bit over a weekend in Switzerland.
+
+Saturday morning, I got a TGV to Mulhouse, then a local (international) train to Bâle (Basel), and then a Swiss intercity train to Zurich, where I met up with Michael, who is in Geneva for 7 weeks.
+We saw a bit of Zurich, went for a cruise on the lake, went to the Swiss National Museum, walked around a bit, and went to the top of Üetliberg.
+
+Then, on Sunday morning, we got a train to Geneva, which was a tilting train, which is kind of odd. Then, I checked in to the YHA, and got a "Geneva Transport Card", which all people who stay in Geneva get given. This allows free public transport usage during the stay (up to 15 days), which is a pretty cool idea. Then, we went to the Botanic gardens (kind of disappointing), looked at the UN building, some [[!wikipedia Broken_Chair]], and went to the Red Cross (and Red Crescent) Museum, which was really interesing (though 15CHF; actually, everything is expensive in Switzerland).
+
+Then we walked around the old town a bit went down to the Lake (but the Jette wasn't going :( ), and caught several boats across the lake and back, until we ended up back at Cornavin (Station), where we caught a bus to Michael's residence, so he could charge his cellphone (iPhones...). Then, we went back in to town, met up with one of his fellow interns, and went in search of dinner.
+We wanted to go to [[!wikipedia Plainpalais]], but following Michael (and iPhone), we went a very circuitous route, and finally arrived very hungry.
+
+After that I went to the youth hostel (only feature of note was the "keys", which are cards with a [[!wikipedia 2D_barcode]] on them, which opens the rooms, and each person's locker, just outside the room. (Actually, given they are not disposable, but get reused, maybe there's more than just a barcode, but still a cool idea).
+
+Monday morning, I caught a train to Lausanne. While waiting for my train, I saw something which might help explain how they keep to time. The doors were closing, and someone put their arm in the door to stop it, so that they could get on. So, that door opened again, but that didn't stop the train leaving. After a while, the door did close. I imagine in NZ that if the doors aren't closed, the train won't go. Not the case here.
+
+In Lausanne I went to visit a group at EPFL, which was really good, friendly people and interesting facilities. Then a bit of a walk around Lausanne (which is on a hill, and has lots of bridges, which is interesting), before the TGV back to Dijon.
+
+That's all the travel until I head off to Sicily, I think.

diff --git a/travel/brussels_and_beyond.mdwn b/travel/brussels_and_beyond.mdwn
new file mode 100644
index 0000000..c195813
--- /dev/null
+++ b/travel/brussels_and_beyond.mdwn
@@ -0,0 +1,25 @@
+So, last weekend I ahd a short trip to Brussels.
+After all the flying I had done to get here, it was much nicer travelling by train, even one with connections to make.
+
+I had an early 7.25am train from Dijon, which mean catching the 6.45am tram (to be sure of making the train). The train of course arrived and left on time, and got to Paris just afer 9am. Then a trip on the RER from Gare de Lyon to Gare du Nord, and a short (~25 minute) wait for the Thalys to Brussels-Midi.
+
+This again was a pleasant trip, and took abour 1 hour 20, arriving at 11.23am. I then chose to walk to the (cheap) hotel where I was staying, and managed, through not wanting to consult the map on my phone much, to end up walking much too far (I took the wrong street, then cut back, but it was nice to see some of the city). I was too early for checkin, so left my (light) bag there, and went exploring.
+
+I went to the clearly-for-kids Mini-Europe, which was sort of fun, but really I was there to see the Atomium, built for the 1958 World's Fair. It is kind of (very) weird, but it was fun to go up it, in what was once the world's fastest elevator.
+
+After that, I went for a walk to the Grand-Place, the Cathedral and around there, which was really cool. Brussels (that part, and all the parts that I saw at least) really does not feel like a big city.
+
+The next morning (Sunday) I went to the Museum of Brussels, Belvue, and learnt about Belgian history (of which I was unaware), and also to Coudenberg, and archaeological site next to the museum, under a road (and some buildings).
+
+Next, I went to the Tram Museum, with examples from Brussels' long association with trams, and then met up with Nick and Thibault,back in the Grand-Place.
+We walked around for a bit, had a waffle, and then went back to the Delerium Club (I think), the bar with the most varieties of beer on offer (at least 2004!). I'm not so taken with the beer, but that is pretty amazing. Also Tui, but at ~€5/330ml (I think), probably not worth having...
+
+We then drove round for a bit (in Thibault's car), had some frites, walked a bit, saw the amazing Palace of Justice, which sadly we couldn't enter. But just the outside verandahs are amazing.
+We then saw Thibault's university (UCL, Université catholique de Louvain), and went back to Thibault's place for a bit. Then, he dropped me back at my hotel, for an early start the next morning.
+
+My train was at 6.13am. So, I got the tram about 5.30, in order to have plenty of time. This meant getting up just after 5, which I feel is a bit too early.
+Anyway, the train was easy, then a reverse of the connection in Paris, again easy, and some time to spare waiting for the next one to leave. I was on the top floor of a double-decker TGV to Zurich(?), as far as Dijon. Again, a very easy trip.
+
+So, that's not the last of my travels. I have booked to go to Switzerland this weekend. I left it late, so there was no (affordable) accommodation in Geneva that I could find, so Michael (whom I am going to see) and I are going to Zurich on Saturday, staying the night there, and then heading back to Geneva, where I have a backpackers for Sunday night. Then, I head to Lausanne to see a group at the university (EPFL) there, and then back to Dijon Monday evening.
+
+I also have booked a flight to London, 31 July in the evening, and am staying with Gwynne until I leave on August 2. So, that should be all my travel booked now!

diff --git a/travel/Dijon-bound.mdwn b/travel/Dijon-bound.mdwn
new file mode 100644
index 0000000..47d3348
--- /dev/null
+++ b/travel/Dijon-bound.mdwn
@@ -0,0 +1,17 @@
+Ok, this is a travel blog, and while the conference is interesting, I'm not going to blog about it.
+
+So, I got a bus to Ottawa airport with one of the other people from the conference, and we had to wait a long time, while all of the other possible bus numbers turned up, and even variants of the 97 that we wanted that didn't go to the airport. Eventually, about 5 mins away from getting in a taxi, it turned up, in the 30 degree C heat, and we got there.
+
+The line through security was really slow (it is a ridiculous process, much moreso than in NZ), and fortunately I got picked to be screened for explosives, as that meant I got to skip a large part of the queue.
+
+The flight to Toronto was short (<1 hour), and oddly once there I didn't have to go through more security, in contrast to say Sydney. In fact, very odd to a kiwi, I didn't have to show my passport to anyone, except when checking in in Ottawa and boarding each flight. No customs or immigration (leaving) there. I do remember a lot of walking, though, to get to the international departures area. 10-15 minutes.
+
+Once again, was very near the back of the (long) plane to Paris, row 57 of 63 (I think). But, not so bumpy as the one to Vancouver. And much shorter flight, about 6-7 hours.
+
+Arriving in Paris, the landing was the worst I have had for a long time, as the plane jerked sideways upon the rear wheels touching down.
+
+Paris airport was easy, except the luggage seemed to take a while (a big, full plane), and the queue for the immigration was slow (only for the man to simply stamp my passport, not even say anything to me).
+
+Then a long (10 minute) walk within the terminal to get to the train station, buy a ticket, and head to Denfert-Rochereau, on the RER B. Arrived at Antoines (I even remebered the way) at just after 12, and my plane landed at ~10, so two hours. That was from out of Schengen though.
+
+It was nice seeing Antoine, and we went for a crêpe for lunch, then bought a SIM card (lebara.fr), and caught the RER to Saint-Michel Notre Dame, and went for a walk along the Seine. Then, another (sweet) crêpe, and back to his place, before catching a couple of Metros to Gare de Lyo, where I caught the TGV to Dijon. Currently we're rocketing through the french countryside, and I get off at the first stop. Camille's parents should be meeting me, so that will be nice. I'm looking forward to staying in Dijon for an extended period.

diff --git a/travel.mdwn b/travel.mdwn
index 831e669..0a7bf4d 100644
--- a/travel.mdwn
+++ b/travel.mdwn
@@ -1,3 +1,3 @@
-Here is a full list of posts to my [[travel blog|travel]].
+Here is a full list of posts to my [[travel blog|travelblog]].
 
 [[!inline pages="./travel/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
diff --git a/travelblog.mdwn b/travelblog.mdwn
index 976df25..0bc90fe 100644
--- a/travelblog.mdwn
+++ b/travelblog.mdwn
@@ -5,10 +5,10 @@ Welcome to my travel blog.
 Note that times given are all GMT.
 
 Have a look at the most recent posts below, or browse the tag cloud on the
-right. An archive of all [[travel|posts]] is also available.
+right. An archive of all [[posts|travel]] is also available.
 
 [[!inline pages="./travel/* and !*/Discussion" show="10"
-actions=yes rootpage="travel"]]
+actions=yes rootpage="travelblog"]]
 
 ----
 

diff --git a/travel/ottawa.mdwn b/travel/ottawa.mdwn
new file mode 100644
index 0000000..24b08d6
--- /dev/null
+++ b/travel/ottawa.mdwn
@@ -0,0 +1,7 @@
+So, I am finally in Ottawa.
+
+I got a bus from the airport, which for a large part of the journey was on a "Transitway", ie a dedicated busway, which was fast.
+
+I'm in my hotel room, and after ~34 hours awake, feel like getting some sleep.
+
+Conference tomorrow.

diff --git a/travel/in_sydney/comment_1_bruce._comment b/travel/in_sydney/comment_1_bruce._comment
index 35d671a..36d312e 100644
--- a/travel/in_sydney/comment_1_bruce._comment
+++ b/travel/in_sydney/comment_1_bruce._comment
@@ -1,5 +1,5 @@
 [[!comment format=mdwn
- username="We have got up again. Beautiful day, already driven your car, when I went to feed Moonlight"
+ username="https://www.google.com/accounts/o8/id?id=AItOawnEmkxP0mLaMGbVaOZB6eogebn"
  nickname="Bruce"
  subject="Off to Featherston"
  date="2013-05-25T23:29:02Z"
diff --git a/travel/off_to_featherston.mdwn b/travel/off_to_featherston.mdwn
deleted file mode 100644
index 71ef33c..0000000
--- a/travel/off_to_featherston.mdwn
+++ /dev/null
@@ -1,4 +0,0 @@
-We have got up again. Beautiful day, already driven your car, when I went to feed Moonlight
-
-
---Bruce

diff --git a/travel/in_sydney/comment_1_bruce._comment b/travel/in_sydney/comment_1_bruce._comment
index 8ec781c..35d671a 100644
--- a/travel/in_sydney/comment_1_bruce._comment
+++ b/travel/in_sydney/comment_1_bruce._comment
@@ -1,8 +1,7 @@
 [[!comment format=mdwn
  username="We have got up again. Beautiful day, already driven your car, when I went to feed Moonlight"
  nickname="Bruce"
-ff to Featherston
- subject=""
+ subject="Off to Featherston"
  date="2013-05-25T23:29:02Z"
  content="""
 We have got up again. Beautiful day, already driven your car, when I went to feed Moonlight

diff --git a/travel/in_sydney/comment_1_bruce._comment b/travel/in_sydney/comment_1_bruce._comment
index 22a86b8..8ec781c 100644
--- a/travel/in_sydney/comment_1_bruce._comment
+++ b/travel/in_sydney/comment_1_bruce._comment
@@ -3,7 +3,7 @@
  nickname="Bruce"
 ff to Featherston
  subject=""
- date="2013-05-2T23:29:02Z"
+ date="2013-05-25T23:29:02Z"
  content="""
 We have got up again. Beautiful day, already driven your car, when I went to feed Moonlight
 """]]

diff --git a/travel/in_sydney/comment_1_bruce._comment b/travel/in_sydney/comment_1_bruce._comment
new file mode 100644
index 0000000..22a86b8
--- /dev/null
+++ b/travel/in_sydney/comment_1_bruce._comment
@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="We have got up again. Beautiful day, already driven your car, when I went to feed Moonlight"
+ nickname="Bruce"
+ff to Featherston
+ subject=""
+ date="2013-05-2T23:29:02Z"
+ content="""
+We have got up again. Beautiful day, already driven your car, when I went to feed Moonlight
+"""]]
diff --git a/travel/off_to_featherston.mdwn b/travel/off_to_featherston.mdwn
index 2a65329..71ef33c 100644
--- a/travel/off_to_featherston.mdwn
+++ b/travel/off_to_featherston.mdwn
@@ -1,2 +1,4 @@
 We have got up again. Beautiful day, already driven your car, when I went to feed Moonlight
 
+
+--Bruce

diff --git a/travel/in_toronto.mdwn b/travel/in_toronto.mdwn
new file mode 100644
index 0000000..6375374
--- /dev/null
+++ b/travel/in_toronto.mdwn
@@ -0,0 +1,6 @@
+Have arrived in Toronto.
+
+FLight was quite long from Vancouver (~4hrs), especially as there was no food.
+However, I did sleep quite a lot, which is probably a good thing. I've totally lost track of how long it's been since I got up in Wellington (computer says 26 hours!).
+
+My next flight is the one to Ottawa. Looking forward to the travelling being over.

diff --git a/travel/something_had_to_go_wrong.mdwn b/travel/something_had_to_go_wrong.mdwn
new file mode 100644
index 0000000..39e59d3
--- /dev/null
+++ b/travel/something_had_to_go_wrong.mdwn
@@ -0,0 +1,16 @@
+I'm sitting in Vancouver airport, waiting for my next flight.
+
+The long flight from Sydney arrived at 8.20 Vancouver time (will work out duration later), and was late. It was also one of the bumpiest flights that I've been on, with the seatbelt sign on for protracted periods, and perhaps as I was sitting in row 41 of 45, it was probably for good reason.
+
+As a result, I missed the connection to Ottawa (by about 15 minutes), so am rebooked through Toronto.
+
+Instead of 
+
+* AC166 Vancouver - Ottawa
+
+I now do
+
+* AC1166 Vancouver - Toronto
+* AC464 Toronto - Ottawa, and arrive about 2013 (a time, not the year; not sure exactly when it's meant to arrive)
+
+Hopefully I don't miss that connection too!

diff --git a/travel/off_to_featherston.mdwn b/travel/off_to_featherston.mdwn
new file mode 100644
index 0000000..2a65329
--- /dev/null
+++ b/travel/off_to_featherston.mdwn
@@ -0,0 +1,2 @@
+We have got up again. Beautiful day, already driven your car, when I went to feed Moonlight
+

diff --git a/travelblog.mdwn b/travelblog.mdwn
index fc141f4..976df25 100644
--- a/travelblog.mdwn
+++ b/travelblog.mdwn
@@ -2,6 +2,8 @@
 
 Welcome to my travel blog.
 
+Note that times given are all GMT.
+
 Have a look at the most recent posts below, or browse the tag cloud on the
 right. An archive of all [[travel|posts]] is also available.
 

diff --git a/travel/in_sydney.mdwn b/travel/in_sydney.mdwn
new file mode 100644
index 0000000..0f6d55d
--- /dev/null
+++ b/travel/in_sydney.mdwn
@@ -0,0 +1,5 @@
+So, I have arrived in Sydney airport, waiting for my flight to Vancouver.
+
+Check-in in Wellington was amusing, where the system was only showing flights as far as Vancouver (not Ottawa), but after checking thinking it would "probably" print boarding passes for the Ottawa flight too (it did).
+
+The next flight is pretty long...

diff --git a/msvto.mdwn b/msvto.mdwn
index fc3d4f1..76ab24b 100644
--- a/msvto.mdwn
+++ b/msvto.mdwn
@@ -1,3 +1,5 @@
+*Update*  Final video is now available at <http://wrcs-file-share.s3.amazonaws.com/MSvTOFinal.mp4>, and should shortly have some music added. Enjoy :)
+
 We are making a movie Mini Shark vs Tiny Octopus, in the style of [[!imdb tt1350498 desc="Mega Shark vs Giant Octopus"]].
 There is a [[script]].
 ## Scenes

diff --git a/travelblog.mdwn b/travelblog.mdwn
new file mode 100644
index 0000000..fc141f4
--- /dev/null
+++ b/travelblog.mdwn
@@ -0,0 +1,13 @@
+[[!pagestats pages="./tags/*"]]
+
+Welcome to my travel blog.
+
+Have a look at the most recent posts below, or browse the tag cloud on the
+right. An archive of all [[travel|posts]] is also available.
+
+[[!inline pages="./travel/* and !*/Discussion" show="10"
+actions=yes rootpage="travel"]]
+
+----
+
+This blog is powered by [ikiwiki](http://ikiwiki.info).

diff --git a/travel.mdwn b/travel.mdwn
new file mode 100644
index 0000000..831e669
--- /dev/null
+++ b/travel.mdwn
@@ -0,0 +1,3 @@
+Here is a full list of posts to my [[travel blog|travel]].
+
+[[!inline pages="./travel/* and !*/Discussion" archive=yes feedshow=10 quick=yes]]
diff --git a/travel/all_packed.mdwn b/travel/all_packed.mdwn
new file mode 100644
index 0000000..bc1613b
--- /dev/null
+++ b/travel/all_packed.mdwn
@@ -0,0 +1,5 @@
+So, I am mostly all packed, and ready to go.
+
+I am staying the night at my parents', as the 6.40am flight requires leaving home about 4.30am, and I'll take any extra sleep I can get.
+
+Tomorrow morning I fly to Ottawa, via Sydney and Vancouver (flight times ~3hrs, ~14hrs, ~5hrs), so a fair bit of flying ahead.

diff --git a/msvto.mdwn b/msvto.mdwn
index c461c7e..fc3d4f1 100644
--- a/msvto.mdwn
+++ b/msvto.mdwn
@@ -31,7 +31,8 @@ Quotes (from BA):
 * "I can't say I'm disappointed"
 * "Awesome"
 * "I have some artistic input: stop it"
-
+* "I WILL HAVE NO INPUT"
+* "this is insane. Cameras should be way more expensive than they are, to prevent such things from happening."
 
 On May 8, WS and SR discussed the remaining footage that we need.
 

diff --git a/msvto.mdwn b/msvto.mdwn
index 5386451..c461c7e 100644
--- a/msvto.mdwn
+++ b/msvto.mdwn
@@ -48,4 +48,11 @@ On May 8, WS and SR discussed the remaining footage that we need.
 1. Some scene on a beach (might combine with celebration of end of filming)
 
 
-There are some credits, at [[msvto/credits]]
+There are some credits, at [[msvto/credits]].
+
+Final changes to make:
+
+* Add in sound of some sort, possibly projector noises
+* Consider replacing green screen with a rainbow or something? that moves with the camera?
+* Add subtitles/intertitles
+* Add in comments from our critic

diff --git a/msvto/credits.mdwn b/msvto/credits.mdwn
index 9487e72..3ef846d 100644
--- a/msvto/credits.mdwn
+++ b/msvto/credits.mdwn
@@ -1,8 +1,8 @@
 Starring
 
-* Camille "I'm a natural blonde" Artur as 
-* Martin Klimsa as Professor
-* Ben Wylie-van Eerd as Chinese/Japanese Scientist
+* Camille "I'm a natural blonde" Artur as Female Lead
+* Martin "Sharkbait" Klimsa as The Professor
+* Ben Wylie-van Eerd as Not a Token Asian Male Lead
 
 also
 

diff --git a/msvto/credits.mdwn b/msvto/credits.mdwn
index 02a79c2..9487e72 100644
--- a/msvto/credits.mdwn
+++ b/msvto/credits.mdwn
@@ -1,8 +1,8 @@
 Starring
 
 * Camille "I'm a natural blonde" Artur as 
-* Martin Klimsa as
-* Ben Wylie-van Eerd as
+* Martin Klimsa as Professor
+* Ben Wylie-van Eerd as Chinese/Japanese Scientist
 
 also
 

diff --git a/msvto/credits.mdwn b/msvto/credits.mdwn
index adb1dd2..02a79c2 100644
--- a/msvto/credits.mdwn
+++ b/msvto/credits.mdwn
@@ -12,7 +12,8 @@ also
 
 Technical Staff
 
-* Shrividya Ravi, Director of Photography, Trailer editing, Writer, Casting
-* Walter Somerville, Director, Editor, Writer
+* Shrividya Ravi, Director of Photography, Trailer editing, Writer, Casting, Props
+* Walter Somerville, Director, Editor, Writer, Props
 * Pablo Etchegoin, Producer
-* Baptiste Auguié, Critic
+* Baptiste Auguié, Critic, Equipment Supplier, Props
+* Alex Barker, Music