More bug fixes, raised initial thresholds.