adjustments and cleanup.