Updates to Naughty-nice algorithm

Summary: Last minute updates for Klaus

Test Plan: check it once, check it twice

Reviewers: wotte

Differential Revision: https://phab.face.isis.vanderbilt.edu/D7