fix to fix
Merge branch '21-apply-dots' into 29-cleanup
Merge branch '21-apply-dots' into 30
revise fix in filecopy
Merge branch '29-cleanup' into 30