improvements and typos