Some changes and typos