Some cosmetic changes and corrections