more copy improvements