merge to r7619 tag2.2, and small changes in variables and comments. Now includes highres routing and correction of problemwith snow (twbr)