more tweaks and copy changes