several copy improvements