copy changes and style tweaks