Add better handling for client sessions and rsync