copy changes and small tweaks