enhanced clone support, added dryrun, code-cleanup