[PD-dev] [clone] improvements/bug fixes