various tiny adjustments