Minor improvements and typos