Various copy improvements based on Cyd's feedback