big cleanup of and bugfix to copy file participant