jtracey
Looks like @mappinjack has taken care of most of this (thanks!). I'm leaving this open for now, because strictly speaking it's not correct, since the Laurel Trail here is still closed for construction. There's also a few other issues remaining, but I'll mark them with individual FIXMEs or notes.