several largish changes.