flagged clock outs
Merge fixes