Some cosmetic and typo fixes