more rsync logic/bug fixes