Various adjustments and fine-tuning.