many typo and copy changes
merging james changes