Mostly cosmetics and some corrections.