more typos; some reformatting