some final, mostly cosmetic, changes