fix on thresholds and comments