Sync'ing remaining changes after recent CVS problems. Seem to now have my route back!