Copy tweaks and minor changes