some last adjustments