a few minor changes and typos