Add more thresholds. Minor fixes.