Tweak file copying
Update option naming