stable checkin
Various updates from thur I don't want to lose
Minor cleanup.  "Compile" offsets once.