debug checks for flag tests
flag checks
Merge branch 'Greg-Sauce' into Nima-Ghods
small changes