Added TODO about --rerun_after and rerun threshold
Fixed problem with rerun_threshold constraint together with --rerun_after option