BugFix for set 1 when only one filetable present. (plus moved some code around to elminate duplicate pieces)
Minor conflict
Add region support for diags.py