new thresholds + minor bug fix