Accuracy improvements and code adjustments.