more changes, mostly cosmetic