Fremont/Fryton Route Matching updates

Also updated some initial conditions