Some ˚changes, mostly cosmetic