No-fail Criterion and print fix. Now caught up on outstanding commits.

No-fail Criterion and print fix. Now caught up on outstanding commits.