more cloning improvements