More formatting and copy changes